Merge commit 'b11e670e56b30022dbaaa921390005a95dfd337b'
* commit 'b11e670e56b30022dbaaa921390005a95dfd337b':
Fix some 12- vs 24-hour problems in the FormatDateRange strings.
Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'
* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
Make aapt Error out when an overlay adds a string.
Use a resource instead of a hardcoded string for the 24-hour format
since it is not exactly the same in every locale.
Make sure the 12-hour format is actually for a 12-hour clock, even in
locales where this is not a normal thing to do. In the cap_ampm version,
do not have it try to capitalize "am" and "pm" if these are non-ASCII
strings, since strftime() doesn't know about Unicode and will mess it up.
Add a comment so that people don't think the YEAR_IN_MILLIS constant is
actually the length of any real year.
Merge commit '6b4b50b8079aa274727c3120f858179eb6259351'
* commit '6b4b50b8079aa274727c3120f858179eb6259351':
Add support for custom tab views in TabHost and TabWidget.
This change adds the ability to specify an arbitrary view for a tab
indicator. It also adds support for specifying a drawable to use as
the divider between tab views.
Merge commit 'b81645c868b3d596b5ac56822959feb629a8651e'
* commit 'b81645c868b3d596b5ac56822959feb629a8651e':
ActivityManager: Ensure that we clear the calling process identity around calls to Process.setProcessGroup().
Merge commit '9e09e0f439ab30b8856d46827623652d09b7477b'
* commit '9e09e0f439ab30b8856d46827623652d09b7477b':
zygote: Add CAP_SYS_NICE to system server capabilities
1. The authType should be specified in the APN database.
This was hardcoded to 3 in the qmi driver. We currently set it to
3 in the RIL till the apn database side changes are done.
2. RIL_SEND_SMS response has errorCode as a new field,
Merge commit 'df01deaacff82b918b4f0ba774d5ad3087543629'
* commit 'df01deaacff82b918b4f0ba774d5ad3087543629':
More restore plumbing, plus add suggested-backoff to transport API
Adds most of the code for a background-thread restore process, structured much
like the backup thread. Broke some common functionality out into a helper
function for doing a synchronous wait for a requested agent to attach.
Added a method to IBackupTransport whereby the transport will be asked for
an opinion on whether this is a good time for a backup to happen. It will
reply with the results of its policymaking around backoff intervals, time-of-day
selection, etc.
Merge commit 'a32b5f3252a58416f328399680395aa5fa936640'
* commit 'a32b5f3252a58416f328399680395aa5fa936640':
Manual merge from cupcake_dcm. Need to be reviewed by enf.
Merge commit '09ea1e9cce29435282eb4c671cf6cebe26414e41'
* commit '09ea1e9cce29435282eb4c671cf6cebe26414e41':
Show progress spinner while waiting for results in in app search.
Merge commit '174ad503ee5b24721d7d632ba9c68b9cd0bd6dd6'
* commit '174ad503ee5b24721d7d632ba9c68b9cd0bd6dd6':
In SearchablesTest, use the always available globalsearch.
Merge commit '3b277c700e6907ee0813839604ac60df2141c557'
* commit '3b277c700e6907ee0813839604ac60df2141c557':
Change exceptions to RuntimeException.
Fix the way gestures are rasterized to bitmaps.
The earlier used googlesearch package may not be available in some devices so switching to globalsearch which has searchable info relevant for this unit test.
