Merge commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e'
* commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e':
Pass the originating app's versionCode along with a restore set
Merge commit '58ee037191b5d9c2b149870868f9646bd428af2a'
* commit '58ee037191b5d9c2b149870868f9646bd428af2a':
Fix a few more blatantly wrong date formats.
* changes:
Fix 3 bugs in fountain test. Correctly generate the last mip level of a non-square mip chain. Default the background to not blended and disable dither/depth.
Merge commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9'
* commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9':
Set organizations to be null for generateKeyPair to use the default.
Merge commit '2830b9226bc737da970f8d20601ccde19008415c'
* commit '2830b9226bc737da970f8d20601ccde19008415c':
Update the gservices gtalk setting for the terms and services url.
Merge commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6'
* commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6':
Launch user-entered URLs directly without a web search.
Merge commit '3a31a93b8a195ae2d0180e6dfbf292da2e581f50'
* commit '3a31a93b8a195ae2d0180e6dfbf292da2e581f50':
Add some global metadata to the restore set
Merge commit '72be40490951d3f9d0ada16fcf5288d0c3306d88'
* commit '72be40490951d3f9d0ada16fcf5288d0c3306d88':
fix warnings that will show up with GCC 4.4 (in master)
Merge commit 'bbf781379b134812458591722c986cb29c396a5b'
* commit 'bbf781379b134812458591722c986cb29c396a5b':
Yet another round of trying to get the date formats right.
Merge commit 'cde13e6bfa6465d5770755892e2ee234a1f85d5c'
* commit 'cde13e6bfa6465d5770755892e2ee234a1f85d5c':
gps: Check for null APN name to avoid a runtime restart.
* changes:
Helper API cleanup. Allows multiple helpers to function, because they'll always go in the same order, and this lets us not have to write headers to keep them paired.
Merge commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01'
* commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01':
Fixes#1933585. Don't dismiss ACTV's drop down when it's set to alwaysVisible.
Merge commit '07a5f126df2cf0dbeb7096535ae634ea8eaeb306'
* commit '07a5f126df2cf0dbeb7096535ae634ea8eaeb306':
At boot time, add additional per-device information to the
* changes:
At boot time, add additional per-device information to the kernel randomness pool. This helps increase the quality / uniqueness of the random numbers, and is especially important during the device's first boot, when insufficient randomness is available.
* changes:
Fix issue with shared user permissions. just look in the requested permissions of packages within shared user setting rather than the granted permissions
Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b'
* commit '2c10b5f483f832523305c11d44035fc7f5d9a54b':
Make all static methods in SearchManager non-static.
