Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo

                for (endIndex=startIndex; 

                        endIndex < len && wlBuffer[endIndex] != '\n' && wlBuffer[endIndex] != '\0'; 

                        endIndex++);

                // Don't go over the end of the buffer

                if (endIndex < len) {

                    endIndex++; // endIndex is an exclusive upper bound.

                }

                String[] nameStringArray = mProcWakelocksName;

                long[] wlData = mProcWakelocksData;