OSDN Git Service
Dirk Dougherty [Thu, 28 Jun 2012 07:54:37 +0000 (00:54 -0700)]
Merge "Doc change: update Missed Call part of notification image." into jb-dev
Dirk Dougherty [Thu, 28 Jun 2012 07:52:08 +0000 (00:52 -0700)]
Doc change: update Missed Call part of notification image.
Change-Id: Ibffe3dcefce343838ba5b3dfde1edf05bfc0f9ad
Joe Fernandez [Thu, 28 Jun 2012 07:31:03 +0000 (00:31 -0700)]
Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev
Joe Fernandez [Thu, 28 Jun 2012 06:33:20 +0000 (23:33 -0700)]
docs: ADK2 update for new IDE download files and instructions
Change-Id: Id0e3e42a0a0c19afafa039f9df6763ae337b1f0b
Dirk Dougherty [Thu, 28 Jun 2012 02:56:17 +0000 (19:56 -0700)]
Doc change: update caption for notifications screen shot.
Change-Id: I7d5a947a36f315365875887e540be9ecb7402175
Matthew Xie [Wed, 27 Jun 2012 22:47:53 +0000 (15:47 -0700)]
Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev
Jake Hamby [Wed, 27 Jun 2012 22:27:43 +0000 (15:27 -0700)]
Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev
Matthew Xie [Wed, 27 Jun 2012 08:15:27 +0000 (01:15 -0700)]
Get rid of the extra bt_disable call when turning on airplane mode
Get rid of enabling bt when in airplane mode.
Current code has 2 paths that trying to place bluetooth in cold state when
turning airplane mode on. This caused extra call of bt_disable that
causing a kernel sleep failure. The fix removes one of the sys call.
This CL keeps Bluetooth in cold state after turning airplane mode on
instead of seting it to hotoff state
bug
6563480
Change-Id: I30c413707157acb4a8e83ded9452256cf6260899
Ying Wang [Wed, 27 Jun 2012 21:41:20 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Wed, 27 Jun 2012 21:00:38 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I887e4963f5e4f7690461900b5f5c993d42c8db67
John Spurlock [Wed, 27 Jun 2012 20:27:09 +0000 (13:27 -0700)]
Merge "Disable assist gesture when keyguard is active" into jb-dev
John Spurlock [Tue, 26 Jun 2012 21:42:00 +0000 (17:42 -0400)]
Disable assist gesture when keyguard is active
Prevent search gesture from firing when keyguard is in restricted input mode,
e.g. in Emergency Dialer. Also disable the Home touch listener in this mode to
avoid bringing up the ring. Affects both phone and tablets.
Bug:
6723749
Change-Id: I60f0aebfcce4cf7f66798ee1212ea326bdad3ef0
Scott Main [Wed, 27 Jun 2012 09:13:17 +0000 (02:13 -0700)]
Merge "docs: add info about live wallpaper picker" into jb-dev
Scott Main [Wed, 27 Jun 2012 09:12:35 +0000 (02:12 -0700)]
Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev
Dirk Dougherty [Wed, 27 Jun 2012 08:18:22 +0000 (01:18 -0700)]
Merge "Doc change: remove an unneeded file. Edits." into jb-dev
Dirk Dougherty [Wed, 27 Jun 2012 06:18:11 +0000 (23:18 -0700)]
Doc change: remove an unneeded file. Edits.
Change-Id: I5e89a6e224b0f90207bf3bc625f8d330a28edf37
Dirk Dougherty [Wed, 27 Jun 2012 08:14:28 +0000 (01:14 -0700)]
Merge "Doc change: add diff report for 16." into jb-dev
Scott Main [Wed, 27 Jun 2012 07:55:18 +0000 (00:55 -0700)]
docs: remove empty page and expand system requirements based on URL hash
Change-Id: I9e90af894e6213ef642d3341d169ebb4ec0b8628
Joe Fernandez [Wed, 27 Jun 2012 06:32:03 +0000 (23:32 -0700)]
docs: ADK2 docs - update alternative build instructions
Change-Id: I395749198a0c1589b71d49638620708e2dc2f6ae
Dirk Dougherty [Wed, 27 Jun 2012 05:54:54 +0000 (22:54 -0700)]
Doc change: add diff report for 16.
Change-Id: I38b2e59ac3a553ab7bbde8814e9fb099aa085638
Dirk Dougherty [Tue, 8 May 2012 04:31:24 +0000 (21:31 -0700)]
Set up preview SDK for jellybean.
Change-Id: I953cedece036e20f1eb56503a0c8492a0852ddc0
Scott Main [Wed, 27 Jun 2012 05:13:18 +0000 (22:13 -0700)]
docs: add info about live wallpaper picker
Change-Id: Idc11d9f091117dec53b19b352d24e97dab2c4bd0
Scott Main [Wed, 27 Jun 2012 04:54:08 +0000 (21:54 -0700)]
Merge "docs: add api overview for jb" into jb-dev
Scott Main [Sat, 23 Jun 2012 07:01:22 +0000 (00:01 -0700)]
docs: add api overview for jb
Change-Id: Ibb916138026bb13bb424c826fe8faa563c71bf94
Robert Ly [Wed, 27 Jun 2012 00:58:57 +0000 (17:58 -0700)]
Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev
Robert Ly [Mon, 18 Jun 2012 01:22:17 +0000 (18:22 -0700)]
docs: remove graphics rs docs and restructure existing docs
Change-Id: I8603c827095143327053e8eba855177ec466a948
Mike Lockwood [Tue, 26 Jun 2012 23:57:02 +0000 (16:57 -0700)]
Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
Scott Main [Tue, 26 Jun 2012 23:53:44 +0000 (16:53 -0700)]
Merge "docs: add landing for gcm" into jb-dev
Robert Ly [Wed, 20 Jun 2012 18:54:25 +0000 (11:54 -0700)]
docs: add landing for gcm
Change-Id: Icfe158670c0a07a6dffed496a444e49b5c5ef926
Joe Fernandez [Tue, 26 Jun 2012 23:45:31 +0000 (16:45 -0700)]
Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev
Joe Fernandez [Tue, 26 Jun 2012 23:45:12 +0000 (16:45 -0700)]
Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev
Dianne Hackborn [Tue, 26 Jun 2012 23:36:36 +0000 (16:36 -0700)]
Merge "Fix issue #
6730064: When turning off Nakasi, it very often..." into jb-dev
Mike Lockwood [Tue, 26 Jun 2012 23:31:41 +0000 (16:31 -0700)]
MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
Bug:
6684451
Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
Joe Fernandez [Tue, 19 Jun 2012 22:48:29 +0000 (15:48 -0700)]
docs: GL Tracer, Device Monitor Tools for SDK r20
Change-Id: Ib45210b88a7eb93e3bba4f7d535f344ccb054a72
Katie McCormick [Tue, 26 Jun 2012 22:29:05 +0000 (15:29 -0700)]
Merge "Doc update: Adding new GCM docs." into jb-dev
Katie McCormick [Mon, 25 Jun 2012 16:56:29 +0000 (09:56 -0700)]
Doc update: Adding new GCM docs.
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
Dianne Hackborn [Tue, 26 Jun 2012 21:34:54 +0000 (14:34 -0700)]
Fix issue #
6730064: When turning off Nakasi, it very often...
...turns itself immediately back on.
The ON_AFTER_RELEASE flag is documented to not turn the screen on if
it is currently off.
Unfortunately, it didn't seem to actually do this -- it would just
cause a userActivity() call, which turns on the screen if it is
currently off.
Fix this by adding yet another boolean to that function to tell it
to not poke user activity if the screen is off. (Yes the number of
booleans on it is now insane, and should be cleaned up after we
get through JB.)
Bug:
6730064
Change-Id: I850dfbc777c7668d08b7d63f42a293e22b878256
Joe Fernandez [Tue, 26 Jun 2012 20:15:26 +0000 (13:15 -0700)]
Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev
Peter Ng [Tue, 26 Jun 2012 20:12:45 +0000 (13:12 -0700)]
Merge "image typos in documents fix" into jb-dev
Gilles Debunne [Tue, 26 Jun 2012 20:12:07 +0000 (13:12 -0700)]
Merge "Reducing the contrast of text underline" into jb-dev
Robert Ly [Tue, 26 Jun 2012 19:14:04 +0000 (12:14 -0700)]
Merge "docs: rs api docs" into jb-dev
Robert Ly [Fri, 22 Jun 2012 00:00:34 +0000 (17:00 -0700)]
docs: rs api docs
Change-Id: Ib2f1ae1ba47118242d4a52b943f5eba26714aa1f
Peter Ng [Tue, 26 Jun 2012 18:18:29 +0000 (11:18 -0700)]
image typos in documents fix
Change-Id: I357ff2d99bc2dff9ac27cfd6d1e97afb35740dbc
Kenny Root [Tue, 26 Jun 2012 17:34:44 +0000 (10:34 -0700)]
Merge "Use removePackageLI instead of removing mPackages" into jb-dev
John Spurlock [Tue, 26 Jun 2012 16:55:53 +0000 (09:55 -0700)]
Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev
Joe Fernandez [Mon, 25 Jun 2012 06:58:25 +0000 (23:58 -0700)]
docs: ADK 2012 documentation with AOA protocol docs
Change-Id: Ife96b3ffa890d42fc97125b30bdd389448645562
Scott Main [Tue, 26 Jun 2012 04:17:49 +0000 (21:17 -0700)]
Merge "docs: move NDK into Download section" into jb-dev
Nick Kralevich [Tue, 26 Jun 2012 01:43:56 +0000 (18:43 -0700)]
Merge "DevicePolicyManagerService: dump less" into jb-dev
Nick Kralevich [Tue, 26 Jun 2012 00:39:12 +0000 (17:39 -0700)]
DevicePolicyManagerService: dump less
Reduce the amount of unnecessary information emitted from
the DevicePolicyManagerService.
Bug:
6732364
Change-Id: I639f6beab8471bdbe41ce6cd3a5a378acaf678b2
Dianne Hackborn [Tue, 26 Jun 2012 00:35:49 +0000 (17:35 -0700)]
Merge "Fix issue #
6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev
Dianne Hackborn [Tue, 26 Jun 2012 00:35:36 +0000 (17:35 -0700)]
Merge "Fix issue #
6717667: expanded notification actions don't work on the lock screen" into jb-dev
Dianne Hackborn [Tue, 26 Jun 2012 00:35:21 +0000 (17:35 -0700)]
Merge "DO NOT MERGE Fix issue #
6697105: App launching sometimes has random pauses" into jb-dev
Svetoslav Ganov [Tue, 26 Jun 2012 00:09:24 +0000 (17:09 -0700)]
Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev
Joe Fernandez [Tue, 19 Jun 2012 16:54:07 +0000 (09:54 -0700)]
docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
Change-Id: I37ac2387b1fcc6a321f5c8edc44abe834a01762d
Gilles Debunne [Mon, 25 Jun 2012 22:46:50 +0000 (15:46 -0700)]
Reducing the contrast of text underline
Alpha set to 50%.
Bug:
6712694
Change-Id: Ic292b6e24a97426e835fa379b1fd60d3b7912e99
Kenny Root [Mon, 25 Jun 2012 23:37:32 +0000 (16:37 -0700)]
Use removePackageLI instead of removing mPackages
When adding an system app via OTA, trying to remove it from mPackages
directly doesn't work. The ContentProviders and other things aren't
removed and point to the hidden system app's applicationInfo instead of
the updated app.
Bug:
6685263
Change-Id: I487cf518e0e3c60fae736e9b974617023a7dee8d
Jake Hamby [Mon, 25 Jun 2012 22:27:46 +0000 (15:27 -0700)]
Fix detection of CDMA CMAS cell broadcasts.
CMAS cell broadcasts do not necessarily set the message
priority indicator subparameter. Interpret the user data as a
CMAS message if the service category is in the CMAS range.
Includes a new test case in CdmaSmsCbTest to verify correct
decoding of an actual CMAS monthly test message.
Bug:
6506785
Change-Id: I2a26a5194a1a02e34c1ef862ff348e1571df51c4
Joe Fernandez [Mon, 25 Jun 2012 22:58:47 +0000 (15:58 -0700)]
Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev
Michael Jurka [Mon, 25 Jun 2012 22:26:48 +0000 (15:26 -0700)]
Merge "Update documentation on max widget bitmap usage" into jb-dev
Jeff Brown [Mon, 25 Jun 2012 22:26:19 +0000 (15:26 -0700)]
Merge "Don't wait until boot timeout if there is no wallpaper." into jb-dev
Jeff Brown [Mon, 25 Jun 2012 22:26:14 +0000 (15:26 -0700)]
Merge "Don't enable input dispatch until display enabled." into jb-dev
Ian Ni-Lewis [Mon, 25 Jun 2012 19:59:07 +0000 (12:59 -0700)]
cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f
Change-Id: I894d4f7b265dbbc2792207e7955453dcf27472d6
Michael Jurka [Mon, 25 Jun 2012 22:11:21 +0000 (15:11 -0700)]
Update documentation on max widget bitmap usage
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
John Spurlock [Mon, 25 Jun 2012 21:58:22 +0000 (14:58 -0700)]
Merge "TabletStatusBar: Hide notifications during Setup Wizard" into jb-dev
Andreas Huber [Mon, 25 Jun 2012 21:50:53 +0000 (14:50 -0700)]
Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
Andreas Huber [Mon, 25 Jun 2012 20:53:43 +0000 (13:53 -0700)]
Document some of the more common mimetypes to be used when instantiating
MediaCodec components.
Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
Dianne Hackborn [Fri, 22 Jun 2012 22:21:36 +0000 (15:21 -0700)]
Fix issue #
6717667: expanded notification actions don't work on the lock screen
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.
Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.
Bug:
6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
Dianne Hackborn [Sun, 24 Jun 2012 20:20:51 +0000 (13:20 -0700)]
Fix issue #
6381224: Initial emulator boot fails and shows a blank black screen.
Make sure that all cases where we remove an activity from the history
stack, we call resumeTopActivityLocked() to cause the home activity
to be launched if the stack is now empty.
Also fixed a problem where some timeouts would not be removed when destroying
an activity, and a race condition in boot that would cause the
PhoneWindowManager to initially start out with the home key not working.
Bug:
6381224
Change-Id: If046bb01aed624b0d9ee3bbaaba68ed6b98fd1d0
Scott Main [Mon, 25 Jun 2012 19:31:11 +0000 (12:31 -0700)]
Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
Scott Main [Mon, 25 Jun 2012 18:57:09 +0000 (11:57 -0700)]
Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services" into jb-dev
Scott Main [Mon, 25 Jun 2012 18:55:20 +0000 (11:55 -0700)]
docs: return the sdk terms doc to the site. needs to be revised,
but for now offers some info that's still relevant to some services
Change-Id: I689171ab81b7c47334d8dfa738be80e7eca4581a
Eric Fischer [Mon, 25 Jun 2012 18:32:30 +0000 (11:32 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
John Spurlock [Mon, 25 Jun 2012 18:32:05 +0000 (14:32 -0400)]
TabletStatusBar: Lights-out shadow view should be taller
The lights-out shadow view is now the same height as the system bar.
This makes for a better looking animation (no cropping) and positions
the dots in the right place.
Bug:
6722791
Change-Id: Ifc2cc1586cd72a81a7bb801442be4fa4e03da2a5
Scott Main [Mon, 25 Jun 2012 18:22:10 +0000 (11:22 -0700)]
docs: clean up javadoc code snippets, unescaped entities
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
Eric Fischer [Mon, 25 Jun 2012 18:24:00 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
Scott Main [Mon, 25 Jun 2012 17:02:13 +0000 (10:02 -0700)]
docs: move AIDL doc under Services in api guides.
Change-Id: I525de97958e2093af15cce2b007ec022cb315a71
John Spurlock [Sat, 23 Jun 2012 21:11:27 +0000 (17:11 -0400)]
TabletStatusBar: Hide notifications during Setup Wizard
Protect tablet users going through the initial setup wizard from trapping
themselves in Settings before the setup wizard is complete. A similar change
was already made for phones, so use the same logic.
Also hide quick-settings button (another way to get trapped in Settings) and
associated panel click handler. Remove clear button since we're no longer
showing notification items.
Bug:
6704080
Change-Id: If7148cde9d18f493627f8367fd4b39d22e0d5ef1
Adam Powell [Sun, 24 Jun 2012 21:30:46 +0000 (14:30 -0700)]
Fix MediaRouter bugs
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.
Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.
Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
Jeff Brown [Sun, 24 Jun 2012 19:15:38 +0000 (12:15 -0700)]
Don't wait until boot timeout if there is no wallpaper.
When launching only core apps, the wallpaper service
is not started. Without this change the WM waits
up to 30 seconds for the wallpaper window to be created even
though it will never happen. This introduces a significant
delay before the boot animation is dismissed so the user can
enter a decryption password.
Bug:
6263070
Change-Id: Ia975127a0bf09cf99818f7cc4fd6c0264b740ec6
Jeff Brown [Sun, 24 Jun 2012 19:14:49 +0000 (12:14 -0700)]
Don't enable input dispatch until display enabled.
Bug:
6263070
Change-Id: I05d036fc1d9ec06d164d6743d45bb3f199cfab47
Scott Main [Sat, 23 Jun 2012 23:34:32 +0000 (16:34 -0700)]
docs: remove unused id attribute from Button
Change-Id: Ia61c418972699d40757923fd69ea27b26eddaa05
Scott Main [Sat, 23 Jun 2012 19:36:17 +0000 (12:36 -0700)]
eat comment so it doesn't appear in docs
Change-Id: Id2b539fc80422edb32c86fa17ad888abbc48ba49
Scott Main [Sat, 23 Jun 2012 18:27:20 +0000 (11:27 -0700)]
docs: fix broken link
Change-Id: Ia4ccab838e36b6e0e9298ed7222b5a581d3d5234
Scott Main [Sat, 23 Jun 2012 05:18:26 +0000 (22:18 -0700)]
docs: remove ICS from developer hompage
Change-Id: I6c2ca0f8e859a65f2de1d73198af9fd40d374f95
Scott Main [Sat, 23 Jun 2012 04:23:20 +0000 (21:23 -0700)]
Merge "docs: add jelly bean to homepage" into jb-dev
Scott Main [Sat, 23 Jun 2012 04:21:35 +0000 (21:21 -0700)]
docs: add jelly bean to homepage
Change-Id: I9e94eca22b7255ee84afc5b5ba320368bdfe2200
Adam Powell [Sat, 23 Jun 2012 03:41:31 +0000 (20:41 -0700)]
Sanity check while updating volume in MediaRouteChooserDialog
Bug
6720224
When a window dies it's possible to receive a lingering ACTION_CANCEL
event to the SeekBar for volume. Be sure that we don't try to mess
with something that's already gone by that point.
Change-Id: I4f6119718fc21204d9013d591bc984b785b698b4
Adam Powell [Sat, 23 Jun 2012 02:58:13 +0000 (19:58 -0700)]
Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev
Adam Powell [Sat, 23 Jun 2012 01:19:08 +0000 (18:19 -0700)]
Update route count properly when MediaRouteButton detects
grouped/ungrouped events
Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
Scott Main [Fri, 22 Jun 2012 23:57:57 +0000 (16:57 -0700)]
docs: move NDK into Download section
Change-Id: I7c16b465c45ac4456f689ff81300f65f767acb12
Scott Main [Sat, 23 Jun 2012 00:01:03 +0000 (17:01 -0700)]
Merge "docs: change class names for links to design docs" into jb-dev
Hiroshi Lockheimer [Fri, 22 Jun 2012 22:33:15 +0000 (15:33 -0700)]
Merge "Don't display based on a dummy animation." into jb-dev
Craig Mautner [Fri, 22 Jun 2012 22:19:13 +0000 (15:19 -0700)]
Don't display based on a dummy animation.
The Starting window was being made visible early because the app
token had the dummy animation set. When the real animation started
the Starting window picked it up and became transparent causing
the underlying window to become visible again => jank.
Fixes bug
6691421.
Change-Id: I95fe88d2887760e6da3adedeb6be300eb6755283
Ying Wang [Fri, 22 Jun 2012 21:58:39 +0000 (14:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Michael Jurka [Fri, 22 Jun 2012 21:38:12 +0000 (14:38 -0700)]
Merge "Increase bitmap memory cap for widgets (Bug
6597440)" into jb-dev
Scott Main [Fri, 22 Jun 2012 20:26:08 +0000 (13:26 -0700)]
docs: change class names for links to design docs
Change-Id: I34d85096eecb4e83f52e481411cf2f590d553a37
Adam Powell [Fri, 22 Jun 2012 21:26:20 +0000 (14:26 -0700)]
Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev
Winson Chung [Fri, 22 Jun 2012 21:11:47 +0000 (14:11 -0700)]
Increase bitmap memory cap for widgets (Bug
6597440)
Change-Id: I4149b8c5f204f10ebf0ef1f8d03709c0559178d0
Adam Powell [Fri, 22 Jun 2012 21:08:11 +0000 (14:08 -0700)]
Allow sloppy touch targeting on Action Bar home/up
Bug
6521608
When there are no custom views or other actionable views next to the
action bar's home/up affordance, expand the touch target by a generous
slop value. This helps frustrating cases where a user accidentally
hits just to the right of Up and nothing happens.
Change-Id: I09ef604ce70ad380aab62a373b04c4b02007c644
Ying Wang [Fri, 22 Jun 2012 19:53:57 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idcb453e08823c584fb0f748ebe46ed036046c9d4