OSDN Git Service
Jeff Sharkey [Thu, 22 May 2014 05:45:29 +0000 (05:45 +0000)]
Merge "Support for renaming documents."
Dan Sandler [Thu, 15 May 2014 13:36:47 +0000 (09:36 -0400)]
Introducing Notification.MediaStyle.
Allows you to create a nice music player with all the
trimmings, including:
* up to 5 actions in the bigContentView, styled as
transport control buttons
* up to 2 of those actions in the 1U (!)
* a nice custom progress bar
* a tinted background (taken from your Notification.color)
* a special place to put your MediaSessionToken
Bug:
15147533
Change-Id: Ic20a2b369eb6c5fe4853987a44ffd9bace720c7f
Jeff Sharkey [Thu, 22 May 2014 05:22:03 +0000 (22:22 -0700)]
Support for renaming documents.
DocumentsProviders can mark documents as supporting rename, and they
have the opportunity to change the DOCUMENT_ID as a side effect of
the rename. This supports providers that embed the display name
into DOCUMENT_ID. Issues a URI permission grant to the new document,
if any.
Adds renaming support to platform ExternalStorageProvider. Also
adds directory deletion support.
Bug:
12350110
Change-Id: Ica4b1ae6769ee994f70f6b6b2402213eebd064e0
Jesse Hall [Thu, 22 May 2014 04:41:19 +0000 (04:41 +0000)]
Merge changes Iad983802,Icda236ee
* changes:
opengl: Fix #include style in generated JNI code
opengl: Un-hide GLES31 and GLES31Ext classes
Jesse Hall [Thu, 22 May 2014 04:39:48 +0000 (04:39 +0000)]
Merge "opengl: Add GLES31 and GLES31Ext classes"
Jinsuk Kim [Thu, 22 May 2014 04:24:55 +0000 (13:24 +0900)]
Fix broken build
Change-Id: Icff98663842482149d8c5c5371327121a1adff3d
Jose Lima [Thu, 22 May 2014 04:30:37 +0000 (04:30 +0000)]
Merge "Added Notification.EXTRA_BACKGROUND_IMAGE_URI"
vandwalle [Thu, 22 May 2014 04:29:06 +0000 (04:29 +0000)]
Merge "remember last supplicant failure"
vandwalle [Thu, 22 May 2014 04:21:00 +0000 (21:21 -0700)]
remember last supplicant failure
Change-Id: I644d32d08491ea0c32cb36820d2720da027a49d0
Jesse Hall [Tue, 20 May 2014 03:57:49 +0000 (20:57 -0700)]
opengl: Fix #include style in generated JNI code
Bug:
15028495
Change-Id: Iad98380264c349fddf3b88df0c3a997d94c84fc8
Jesse Hall [Mon, 19 May 2014 22:13:41 +0000 (15:13 -0700)]
opengl: Add GLES31 and GLES31Ext classes
Bug:
15028495
Change-Id: Ie967c1938060edb42864dd48efa668ae7bf5cd76
Jesse Hall [Mon, 19 May 2014 23:42:18 +0000 (16:42 -0700)]
opengl: Un-hide GLES31 and GLES31Ext classes
Bug:
15028495
Change-Id: Icda236ee12a06ef2eb9902253d272dee2b61f6ef
John Spurlock [Thu, 22 May 2014 04:03:20 +0000 (04:03 +0000)]
Merge "Fix header clipping bug on rotate to landscape."
John Spurlock [Thu, 22 May 2014 03:50:13 +0000 (23:50 -0400)]
Fix header clipping bug on rotate to landscape.
Since the header view's manual clipping is a function
of its width, we need to update it whenever the width
changes.
onConfigurationChanged is too early, so wait until the width
actually changes before updating the clip.
Change-Id: I017448f7e1c2d4bbcf7c93a6a47ad3073c43f5d5
Jose Lima [Mon, 19 May 2014 06:44:50 +0000 (23:44 -0700)]
Added Notification.EXTRA_BACKGROUND_IMAGE_URI
Added new EXTRA field to notification to be used to specify
an image that can be displayed to the user when the notification
is selected.
Change-Id: I3f79cf363d885fe2742e74a7d29d7e22ea1e6f60
vandwalle [Thu, 22 May 2014 03:37:01 +0000 (03:37 +0000)]
Merge "make verbose logging a wifimanager hidden API"
Jeff Brown [Thu, 22 May 2014 03:24:47 +0000 (03:24 +0000)]
Merge "Switch to using int stream instead of AudioAttributes"
vandwalle [Wed, 21 May 2014 22:20:59 +0000 (15:20 -0700)]
make verbose logging a wifimanager hidden API
Change-Id: I325f6ea9f1a6c16dbee9aca641cad7ed3bcd7d2c
Jinsuk Kim [Thu, 22 May 2014 03:19:23 +0000 (03:19 +0000)]
Merge "Add feature actions for HDMI-CEC playback device"
Baligh Uddin [Thu, 22 May 2014 03:17:17 +0000 (03:17 +0000)]
am
15685632: (-s ours) am
adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
15685632e0e62651ccfb6bfa2013afe715768126':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:17:12 +0000 (03:17 +0000)]
am
48137740: (-s ours) am
b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
48137740b8f0af0efad73c052256af14e1825944':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:17:07 +0000 (03:17 +0000)]
am
25fe41b8: (-s ours) am
74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
25fe41b8e0a0e7e80bcc533b5087d63767faa689':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:17:02 +0000 (03:17 +0000)]
am
a83b42cb: (-s ours) am
5938757f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
a83b42cb402cb5856e7490f5190c982a9f0575d8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:16:57 +0000 (03:16 +0000)]
am
b8cc0ed8: (-s ours) am
675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b8cc0ed838c8cf303f1e8063db865651627093da':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:14 +0000 (03:11 +0000)]
am
adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
adb0a906dc71a0133b9345031dd88682e49a519a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:11 +0000 (03:11 +0000)]
am
b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b9c1e5a82947e13a10b407a1d4f81967c9af99b4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:08 +0000 (03:11 +0000)]
am
74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:04 +0000 (03:11 +0000)]
am
5938757f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5938757f5154b956f119042ee97b3ac8417a1ac2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:00 +0000 (03:11 +0000)]
am
675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
675b48712ecd0de46d6d3828890b8ca25f1df2bf':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:06:13 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:52 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:49 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:46 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:44 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Jungshik Jang [Thu, 22 May 2014 02:42:19 +0000 (02:42 +0000)]
Merge "Add finish() after timeout of Reqeust Arc operations."
Jinsuk Kim [Tue, 13 May 2014 07:36:15 +0000 (16:36 +0900)]
Add feature actions for HDMI-CEC playback device
- OneTouchPlayAction
- DevicePowerStatusAction
- addHotplugEventListener
- removeHotplugEventListener
Change-Id: Ia7f31507ca62127efbacbbfe07ab43ba1f9bd4cf
RoboErik [Thu, 22 May 2014 02:04:08 +0000 (19:04 -0700)]
Switch to using int stream instead of AudioAttributes
This is an alternate to the submitted API which doesn't use the new
AudioAttributes class and just takes the AudioManager.STREAM instead.
Change-Id: I0365bc6fb9196fc33852ba6b202ca553efe0cc85
Alan Viverette [Thu, 22 May 2014 01:11:19 +0000 (01:11 +0000)]
Merge "Style and asset cleanup"
Alan Viverette [Thu, 22 May 2014 01:10:53 +0000 (18:10 -0700)]
Style and asset cleanup
Updates button drawable and colors, cleans up Quantum styles, updates
highlight attribute name and color, fixes popup backgrounds.
Also fixes GradientDrawable opacity check.
Change-Id: I75dd35e815a8a33ec9f0b16e881e774edfb8c092
Lorenzo Colitti [Thu, 22 May 2014 01:01:50 +0000 (01:01 +0000)]
Merge "Delete the EthernetDataTracker."
Lorenzo Colitti [Thu, 22 May 2014 01:01:47 +0000 (01:01 +0000)]
Merge "Add an AIDL file for IpConfiguration."
RoboErik [Thu, 22 May 2014 00:49:00 +0000 (00:49 +0000)]
Merge "Add stream/volume apis to sessions"
RoboErik [Wed, 21 May 2014 01:03:31 +0000 (18:03 -0700)]
Add stream/volume apis to sessions
This adds RemoteVolumeProviders which handle volume change
events and a way to switch a session between local stream
playback and remote playback handling.
This also adds a way for an app to specify the PendingIntent
to launch when we want to show their ongoing playback UI.
Change-Id: I3a72bf2ec7ca55f61f50859ddc2988eebd491e9d
Chris Craik [Thu, 22 May 2014 00:18:21 +0000 (00:18 +0000)]
Merge "Define light position (using new lighting spec) in Java"
Chris Craik [Thu, 22 May 2014 00:18:09 +0000 (00:18 +0000)]
Merge "Disable shadow drawing for empty/null outlines"
Quddus Chong [Thu, 22 May 2014 00:07:44 +0000 (00:07 +0000)]
am
c370f03c: am
b11a52cb: am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
c370f03c4ff0f6cc4da2fd663f5dc1c64d80ec7f':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Lorenzo Colitti [Wed, 21 May 2014 23:53:46 +0000 (23:53 +0000)]
Merge "Fix a typo in IpConfigStore."
Quddus Chong [Wed, 21 May 2014 23:43:25 +0000 (23:43 +0000)]
am
b11a52cb: am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
b11a52cb6f7db5e1b78582649801632b8d32b978':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Lorenzo Colitti [Wed, 21 May 2014 23:26:58 +0000 (16:26 -0700)]
Delete the EthernetDataTracker.
Code search says these are the only two files that use it. The
tracker will be resurrected in a slightly different form in
frameworks/opt/net/ethernet.
Bug:
14993642
Bug:
14981801
Change-Id: I2477668ca78dfe46661dda1d97c7f786fd7eba35
Alan Viverette [Wed, 21 May 2014 23:37:55 +0000 (23:37 +0000)]
Merge "Clean up hotspot bounds API"
Quddus Chong [Wed, 21 May 2014 23:39:46 +0000 (23:39 +0000)]
am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
a3c773e836dcb97c7f1045c8347dc7267bd21936':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Lorenzo Colitti [Wed, 21 May 2014 23:33:39 +0000 (16:33 -0700)]
Add an AIDL file for IpConfiguration.
Change-Id: I7eb5568185b3facf00627f7d2385c42f247d0acd
Lorenzo Colitti [Wed, 21 May 2014 23:30:22 +0000 (16:30 -0700)]
Fix a typo in IpConfigStore.
Change-Id: I1fc845bf4547ae9a86db02ed29b6d5ba60a01277
Alan Viverette [Wed, 21 May 2014 23:33:45 +0000 (23:33 +0000)]
Merge "Clean up Gradient drawable theming & whitespace"
Jorim Jaggi [Wed, 21 May 2014 23:24:30 +0000 (23:24 +0000)]
Merge "Improve logic when flinging up."
Jorim Jaggi [Wed, 21 May 2014 23:24:09 +0000 (23:24 +0000)]
Merge "Change fling behavior of PanelView."
Jorim Jaggi [Wed, 21 May 2014 23:23:56 +0000 (23:23 +0000)]
Merge "Make velocity tracker used in panel dependent on config."
Quddus Chong [Wed, 21 May 2014 23:23:33 +0000 (23:23 +0000)]
am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
539f9e31726dc780f26901de06c35a4b2446c37a':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Winson Chung [Wed, 21 May 2014 23:12:29 +0000 (23:12 +0000)]
Merge "Small perf tweaks."
John Spurlock [Wed, 21 May 2014 23:08:31 +0000 (23:08 +0000)]
Merge "Zen mode condition selection updates."
John Spurlock [Wed, 21 May 2014 23:07:35 +0000 (19:07 -0400)]
Zen mode condition selection updates.
Change-Id: Ic169066db9783581c5aad2bdf14efd4abe8bb6c1
Winson Chung [Wed, 21 May 2014 23:03:42 +0000 (16:03 -0700)]
Small perf tweaks.
Jorim Jaggi [Wed, 21 May 2014 15:14:18 +0000 (17:14 +0200)]
Improve logic when flinging up.
Makes sure that we don't accelerate even more if the movement is
already fast enough. Around 3000dp/s, we switch to a linear curve.
Change-Id: I9a1cdb1a0a65ed7a8ddf00683c08e83c13bf20f7
Jorim Jaggi [Tue, 20 May 2014 17:41:58 +0000 (19:41 +0200)]
Change fling behavior of PanelView.
Change-Id: Ie700be6b1ef48350601ce6bc7fe60579fddae098
Jorim Jaggi [Wed, 21 May 2014 13:45:07 +0000 (15:45 +0200)]
Make velocity tracker used in panel dependent on config.
The velocity tracker used in PanelView can now be configured with
a boolean value. The default is to use tha platform-standard velocity
tracker, but can be overriden to use our own velocity tracker for
noisy touch screens instead.
Change-Id: I375f4e2675ddbaa003acd6f085065bb3fe59ebf4
Michael Wright [Wed, 21 May 2014 23:01:33 +0000 (23:01 +0000)]
Merge "Add KL file for Logitech F310"
Mindy Pereira [Wed, 21 May 2014 22:59:02 +0000 (22:59 +0000)]
am
246f907b: am
a718943d: Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
* commit '
246f907b546af98d93b6eb2549aaf891cefe2aed':
Make a smaller cliff for dismissing cards
Alan Viverette [Wed, 21 May 2014 22:42:54 +0000 (15:42 -0700)]
Clean up hotspot bounds API
Change-Id: I7daf7e2d360d761f673aa69a0f925b8076ab19c6
Michael Wright [Wed, 21 May 2014 22:31:14 +0000 (15:31 -0700)]
Add KL file for Logitech F310
Change-Id: I03f4fd74fb54571e2045b9289228150a348c994a
Mindy Pereira [Wed, 21 May 2014 22:38:06 +0000 (22:38 +0000)]
am
a718943d: Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
* commit '
a718943d422876488f8723bfe6f35f352ffcb586':
Make a smaller cliff for dismissing cards
Alan Viverette [Wed, 21 May 2014 22:32:03 +0000 (15:32 -0700)]
Clean up Gradient drawable theming & whitespace
Change-Id: I66c857a71e5b4beaee6a7e6c04959fbacee3cbe1
John Spurlock [Wed, 21 May 2014 22:27:29 +0000 (22:27 +0000)]
Merge "Display intercepted notifications if configured."
John Spurlock [Wed, 21 May 2014 22:18:41 +0000 (18:18 -0400)]
Display intercepted notifications if configured.
Don't suppress notifications if the user has configured them
to display, even in zen mode.
Change-Id: Ief549164cafd0922726feaeaf2029b8840dcf735
Mathieu Chartier [Wed, 21 May 2014 22:14:02 +0000 (15:14 -0700)]
Temporary fix for buffer overrun issue.
Allocating the bitmap using getSafeSize() causes problems since
getSafeSize64() < getSize() if there is a stride. Since everywhere
else uses getSize() it results in a lot of possible buffer overruns.
The fix reverts to using getSize instead of getSafeSize64.
Bug:
15089814
Change-Id: Ia471cf9715672d57bb7eb61bf735064aeb405ffe
Adam Lesinski [Wed, 21 May 2014 21:59:33 +0000 (21:59 +0000)]
Merge "Don't dump data from a bad ResTable"
Svetoslav [Wed, 21 May 2014 21:59:19 +0000 (21:59 +0000)]
Merge "Fixing bugs due to the new custom accessibility action APIs."
Mindy Pereira [Wed, 21 May 2014 21:54:37 +0000 (21:54 +0000)]
Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
Svetoslav [Wed, 21 May 2014 21:53:16 +0000 (14:53 -0700)]
Fixing bugs due to the new custom accessibility action APIs.
1. AccessibiltiyAction was incorectly throwing an exception when
a custom action was constructed.
2. AccessibilityManagerService should no longer enforce only standard
actions as we allow custom ones too.
bug:
15110963
Change-Id: Iea57e0a6449b87bd8d103c55ca255e80705f2565
Quddus Chong [Wed, 21 May 2014 21:34:56 +0000 (14:34 -0700)]
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Change-Id: I5e5c40974b2fbaf61256d320d24acf5e0e9178d6
John Spurlock [Wed, 21 May 2014 21:29:20 +0000 (21:29 +0000)]
Merge "Hide the keyguard scrim when the status bar comes back."
John Spurlock [Wed, 21 May 2014 21:28:16 +0000 (21:28 +0000)]
Merge "QuickSettings: fix text alignment."
Dianne Hackborn [Wed, 21 May 2014 21:26:44 +0000 (21:26 +0000)]
Merge "Revert "Hide voice interaction APIs.""
Brian Attwell [Wed, 21 May 2014 21:25:58 +0000 (21:25 +0000)]
Merge "Remove @hide from IN_DEFAULT_DIRECTORY"
John Spurlock [Wed, 21 May 2014 17:04:22 +0000 (13:04 -0400)]
QuickSettings: fix text alignment.
- Abandon dynamic sizing, give each tile a fixed height.
- Align the baselines of the first line of each tile in a row.
- Clean up dimension resources.
- Center the touch feedback on the icon center, and dial it down.
Bug:
15120277
Change-Id: If43986f80ef6d01722b60b6feedb278eed27e936
Dianne Hackborn [Wed, 21 May 2014 21:16:46 +0000 (14:16 -0700)]
Revert "Hide voice interaction APIs."
This reverts commit
a677a9b9367bcf8c81c36dc59b53554cb347b438.
John Spurlock [Wed, 21 May 2014 21:10:10 +0000 (17:10 -0400)]
Hide the keyguard scrim when the status bar comes back.
Since status bar is now the keyguard.
This is an attempt to fix the bad state where the KeyguardScrim
is shown incorrectly when SystemUI is forcibly replaced.
Change-Id: I0416ed400e023a3fa136ce5f884f191edbbd6b94
Baligh Uddin [Wed, 21 May 2014 21:07:31 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39fc3fb7096c632d5856dca116fdacb51ca1701d
Auto-generated-cl: translation import
vandwalle [Wed, 21 May 2014 21:05:44 +0000 (21:05 +0000)]
Merge "various autojoin fixes"
Jason Monk [Wed, 21 May 2014 20:58:48 +0000 (20:58 +0000)]
Merge "Don't exit lock task on sleep"
Baligh Uddin [Wed, 21 May 2014 20:57:22 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb49ad5c4d9a81d64086f05d71e0ff769af3177e
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 May 2014 20:56:23 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d1bfc06ee6a3f8a0f75eaa37a055f0b6f887076
Auto-generated-cl: translation import
Chris Craik [Wed, 21 May 2014 01:10:25 +0000 (18:10 -0700)]
Define light position (using new lighting spec) in Java
Also updates the relative shadow strengths.
Change-Id: I6cac7275d38df98aea9f0dda463cd7207102986a
Jim Miller [Wed, 21 May 2014 20:49:16 +0000 (20:49 +0000)]
am
6f354679: (-s ours) am
af103dd3: am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
6f3546796a381a17e4e8e6dbf869ca75abfab696':
Fix crash in widget pager - DO NOT MERGE
narayan [Wed, 21 May 2014 20:49:09 +0000 (20:49 +0000)]
am
82ec8c58: am
ab3d85ab: am
838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '
82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a':
Fix NPE in PackageManagerService.
Jim Miller [Wed, 21 May 2014 20:43:18 +0000 (20:43 +0000)]
am
af103dd3: am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
af103dd39346d1bae3566cafbfcd1008bc6cef5c':
Fix crash in widget pager - DO NOT MERGE
Jim Miller [Wed, 21 May 2014 20:39:41 +0000 (20:39 +0000)]
am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
911176d7e6c8ba28ed7f7be63edcb17456f615fe':
Fix crash in widget pager - DO NOT MERGE
Svetoslav [Wed, 21 May 2014 20:38:14 +0000 (20:38 +0000)]
Merge "Addressing APIs council feedback"
Jim Miller [Wed, 21 May 2014 20:35:51 +0000 (20:35 +0000)]
am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
607d59982a046d23770a7289be6272ad5983d6ae':
Fix crash in widget pager - DO NOT MERGE
Svetoslav [Wed, 21 May 2014 20:35:38 +0000 (13:35 -0700)]
Addressing APIs council feedback
bug:
15089461
Change-Id: Ifcb003b114e2e50333bb0ef386d99482f7bfaa6e
Baligh Uddin [Wed, 21 May 2014 20:24:07 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49ddd704e0123b75945312b78c3754e112c0308d
Auto-generated-cl: translation import