* 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.
This change amends the doRestore() / onRestore() interface to backup agents to
provide the integer android:versionCode of the app that stored the backup set.
This should help agents figure out how to handle whatever historical data set
they're handed at restore time.
Merge commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9'
* commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9':
Set organizations to be null for generateKeyPair to use the default.
Make punctuation in German and Italian numeric formats self-consistent.
Add missing long standalone Italian month names.
Fix doubled month words in Japanese, Chinese, and Korean.
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.
This is to fix bug http://b/issue?id=1931983
Instead of changing the keyboard button from search to carriage return,
I have changed it from search to 'Go' which I find more useful since
it indicates that the user can now go to that URL.
Merge commit '3a31a93b8a195ae2d0180e6dfbf292da2e581f50'
* commit '3a31a93b8a195ae2d0180e6dfbf292da2e581f50':
Add some global metadata to the restore set
In addition to the signatures of each participating application, we now also
store the versionCode of each backed-up package, plus the OS version running on
the device that contributed the backup set. We also refuse to process a backup
from a later OS revision to an earlier one, or from a later app version to an
earlier.
LocalTransport has been modified as well to be more resilient to changes in the
system's use of metadata pseudopackages.
These are all variations of needing to validate ranges on editing operations
coming from the IME, to account for the underlying text changing (usually being
deleted) asynchronously with the IME.
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.
The change this time is to prefer a format derived from an interval format
to one that is inherited from the root locale. Only a few locales don't
define any interval formats at all and are still have to get anything
from the root locale.
Merge commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01'
* commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01':
Fixes#1933585. Don't dismiss ACTV's drop down when it's set to alwaysVisible.
