Merge commit 'abccd7eaa52d0b8579ba3d1c954dfe7529945c0f'
* commit 'abccd7eaa52d0b8579ba3d1c954dfe7529945c0f':
DO NOT MERGE. Implement IMSI function for CDMA phones
Merge commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da'
* commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da':
DO NOT MERGE - Disable settings backup in Donut
Merge commit 'fae76f5bdeed68efd85805db143b0426de92f7e0'
* commit 'fae76f5bdeed68efd85805db143b0426de92f7e0':
Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard
Merge commit '9ce081aa2493dc163a42decfd4e1756b5c55a834'
* commit '9ce081aa2493dc163a42decfd4e1756b5c55a834':
Add ability to delay messages in Filter based on constraint. Use this to delay 500ms for delete keys in the search dialog.
Merge commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731'
* commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731':
Issue #1969025: need api for launching intent as if it were coming from another component
Merge commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2'
* commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2':
Fix bug that would cause files with blank title tags to not be shown in the music app.
Merge commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83'
* commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83':
Fixing a race condition that causes synthesis to not be aborted
Merge commit '2493097cb077b772af779bf14251e3ac0fff95f8'
* commit '2493097cb077b772af779bf14251e3ac0fff95f8':
Fix the style of preferences headers in the light theme.
Merge commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514'
* commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514':
Only parse search suggestions that look like HTML
Merge commit '5380aa29470274de5b3e445d577ef0834cfacb71'
* commit '5380aa29470274de5b3e445d577ef0834cfacb71':
Get rid of drawing hacks for search dialog suggestions
Includes support to get the MCC and MNC from system properties, since
they are known to be unreliable from the network.
This is known to conflict with master and will be
added by hand so as not to break the build.
* commit 'goog/readonly-korg-master':
Fixed Android issue #400, where the Intent documentation was inaccurate in a number of places, undoubtedly causing untold grief to innumerable masses.
Bug Fixed for libagl.
Actually I don't think it is really an issue here, because the status bar doesn't
start itself up like this until after we have booted, but let's be safe.
And DO NOT MERGE since this code has changed in master.
The "low" and "okay" broadcasts were not being sent with this flag, so that if
the device had booted in a low battery state, the battery service would crash
due to an illegal-state exception.
This fixes bug b/1985606
ServiceTest appears to be causing the whole android unit_tests suite to fail in the
continuous system. Suppressing to stop the lab failure spam while continuing to investigate.
