Merge commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153'
* commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153':
do not merge - add a big flag to turn off backup
Merge commit '8440ecce813112493d2af4097608735c4c7a870c'
* commit '8440ecce813112493d2af4097608735c4c7a870c':
Check if a searchable is null before adding it to the list of searchables
* changes:
Check if a searchable is null before adding it to the list of searchables for web search. If getActivityMetaData returned null for a web search searchable, previously, this null would get added to the list of searchables for web search, which was causing GlobalSearch's SearchSettings to crash with an NPE (which I've guarded against in change 6602).
Merge commit '8f7c7c0c18987b1045cb73e503f82ce429a0d924'
* commit '8f7c7c0c18987b1045cb73e503f82ce429a0d924':
Add a Gservices setting to set the rate at which the home page refreshes.
Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'
* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
wifi: WifiManager.startScan() will now do passive scans by default.
Merge commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf'
* commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf':
Fix a small bug in array length bounds checking.
Merge commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb'
* commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb':
Rename "no" arrays.xml file to be in the correct "nb" locale.
Merge commit 'ed7603779282d416356ce3c9739056d632307275'
* commit 'ed7603779282d416356ce3c9739056d632307275':
Add a persistent system property to disable the adb notification.
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'
* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
Adding a lock to stop so that stop will stop utterances
Merge commit '3bb692338fed7f34f010398fe8b831d0de22c6e8'
* commit '3bb692338fed7f34f010398fe8b831d0de22c6e8':
Keep Gears permissions in sync with system location settings.
Merge commit '313ea433d18e7fd5438b94c0606c496fcc7a2f88'
* commit '313ea433d18e7fd5438b94c0606c496fcc7a2f88':
Make suggestion text color change based on the item state.
Merge commit 'c52d55c5404a09a3845a322f50577fc4c125a86d'
* commit 'c52d55c5404a09a3845a322f50577fc4c125a86d':
Move the watchdog timer to a separate thread...
Merge commit 'b799616d8f0f94e866767fa730f56d82543fb49b'
* commit 'b799616d8f0f94e866767fa730f56d82543fb49b':
Move ExifInterface to android.media package so we can reference it from MediaScanner.
Merge commit '8a715b4b791db4390d12e0ded02280592634a424'
* commit '8a715b4b791db4390d12e0ded02280592634a424':
Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32
* changes:
Fix couple of bugs in the meminfo report. . added the new "/data/dalvik-cache/" to dalvik heap . shortened the starting line's length from 40 to 30 to handle the case where there is no name . fixed the pri/shared for others. It was swapped.
