OSDN Git Service
Ian Rogers [Wed, 16 Mar 2016 15:41:35 +0000 (15:41 +0000)]
Merge "Extra generic type information to aid certain javacs."
Yang Ni [Wed, 16 Mar 2016 15:19:24 +0000 (15:19 +0000)]
Merge "Use proper ScriptCall size in nScriptForEach()"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:19:31 +0000 (13:19 +0000)]
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 11:23:34 +0000 (11:23 +0000)]
Track libcore commit
da61c6a1478cd1a14f3e654460292228f4f15e88
Bug:
27426599
Change-Id: Ia7a00fe975e84ff0dff96d427d089fc26815c2f5
Ian Rogers [Wed, 16 Mar 2016 04:09:40 +0000 (21:09 -0700)]
Extra generic type information to aid certain javacs.
In particular this is needed for the code to compile using the error prone
analyzer.
Change-Id: I09904705ced909ead750cb30d0f96c994132a51c
Yang Ni [Tue, 15 Mar 2016 23:00:02 +0000 (16:00 -0700)]
Use proper ScriptCall size in nScriptForEach()
Bug:
26498479
Although the size of struct ScriptCall is not used underneath in the
runtime or drivers, assign the correct value here to avoid confusion.
Change-Id: I8db19538b9f70f3bf9ee849a8724da3d9ee04785
Adrian Roos [Tue, 15 Mar 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Close notification panel when user button is tapped"
Yi Kong [Tue, 15 Mar 2016 17:05:24 +0000 (17:05 +0000)]
Robert Greenwalt [Tue, 15 Mar 2016 16:40:15 +0000 (16:40 +0000)]
Merge "Add short codes for DCB to free UK and 44567 to standard US."
Yi Kong [Tue, 15 Mar 2016 15:45:07 +0000 (15:45 +0000)]
Track libcore commit
d41ca4a76ea570f9dd89a7ae56410cc75cc0a856
Bug:
27538943
Change-Id: I91fc2e9738dcfb7be061041b5e000b21e7684184
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:23:34 +0000 (13:23 +0000)]
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:04:20 +0000 (13:04 +0000)]
Track libcore change
c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab
Bug:
27426684
Change-Id: I95b19ab738ff05996830c5429367d31ba0d257ba
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 10:47:07 +0000 (10:47 +0000)]
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 10:22:01 +0000 (10:22 +0000)]
Track libcore commit
05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c
Bug:
27426599
Change-Id: I9127856e82a16b891adcdb4e0e841ab2f3a85989
Vasco Brito [Mon, 14 Mar 2016 14:29:39 +0000 (14:29 +0000)]
Add short codes for DCB to free UK and 44567 to standard US.
UK short codes are used by Direct Carrier Billing (DCB) on
Google Play. US short code excludes the Google Wallet dedicated
short code (being used by the Google Wallet team to send
notifications to users) from premium phone numbers.
Change-Id: Idea06bb773d054b9cdc87fad51a428dde1ab83fe
Signed-off-by: Vasco Brito <vascob@google.com>
Stephen Hines [Thu, 10 Mar 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix some errors in errorCalculator.rs."
Narayan Kamath [Thu, 10 Mar 2016 17:42:53 +0000 (17:42 +0000)]
Merge "Fix build broken by
dfce17570e74e94404395a802."
Narayan Kamath [Thu, 10 Mar 2016 17:41:47 +0000 (17:41 +0000)]
Fix build broken by
dfce17570e74e94404395a802.
Change-Id: I2d6f944193919f19774f53db0678fa032878b396
Narayan Kamath [Thu, 10 Mar 2016 17:39:33 +0000 (17:39 +0000)]
Yi Kong [Thu, 10 Mar 2016 16:50:02 +0000 (16:50 +0000)]
Narayan Kamath [Sat, 5 Mar 2016 11:04:19 +0000 (11:04 +0000)]
Track libcore change
45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
bug:
27426688
Change-Id: I6419f2b846932cd089efee1e74400fba97992c92
Yi Kong [Wed, 9 Mar 2016 15:01:04 +0000 (15:01 +0000)]
Track libcore change
b695412b529c8dced105867c6d9d7fd463a67714
Bug:
27427000
Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1
Alan Viverette [Thu, 10 Mar 2016 15:24:13 +0000 (15:24 +0000)]
Merge "fix SeekBarPreference support for summaries"
Daniel Micay [Thu, 10 Mar 2016 01:56:56 +0000 (20:56 -0500)]
fix SeekBarPreference support for summaries
Overriding getSummary breaks support for summaries even though it's
supported in the layout for SeekBarPreference. If there's no summary the
return value is already null in the inherited implementation.
Change-Id: I2e72ea3c4a624acbf200e9617173eb072572fa57
Lorenzo Colitti [Thu, 10 Mar 2016 02:29:09 +0000 (02:29 +0000)]
Merge "Don't crash if we get a DHCP packet with the wrong port."
Stephen Hines [Thu, 10 Mar 2016 00:42:40 +0000 (16:42 -0800)]
Fix some errors in errorCalculator.rs.
Bug: http://b/
26987366
This code was accidentally casting a uchar4 to a single integer, which
the latest llvm-rs-cc will flag as an error. The comparison was also
incorrectly using a single integer comparison, instead of looking at all
4 uchar vector components.
Change-Id: Id680d642cb0079461429f3910343c6dbe8d488ef
Todd Kennedy [Wed, 9 Mar 2016 20:54:07 +0000 (20:54 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications"
Calin Juravle [Wed, 9 Mar 2016 11:57:36 +0000 (11:57 +0000)]
Merge "Update DexFile.getDexOptNeeded in framework"
Calin Juravle [Wed, 9 Mar 2016 11:57:23 +0000 (11:57 +0000)]
Merge "Fix VMRuntime.registerAppInfo usage"
Shubham Ajmera [Wed, 9 Mar 2016 09:57:16 +0000 (09:57 +0000)]
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"
Lorenzo Colitti [Wed, 2 Mar 2016 04:31:52 +0000 (13:31 +0900)]
Don't crash if we get a DHCP packet with the wrong port.
This should only happen if we get a packet in the small time
window between binding the packet socket and programming the
BPF filter on it.
Bug:
26696823
Change-Id: I481f1bc74bbaeb9646d96e1841d2a69acdb47d62
Brian Carlstrom [Wed, 9 Mar 2016 03:30:16 +0000 (03:30 +0000)]
Merge "Remove unneeded dependecy on core-tests to fix build"
Brian Carlstrom [Wed, 9 Mar 2016 01:26:54 +0000 (17:26 -0800)]
Remove unneeded dependecy on core-tests to fix build
Bug:
27555885
(cherry picked from commit
2687673025f9b5a86f917135d2a8288d4f31818b)
Change-Id: I6c0aee5c1823b6c498d9306e4a7c749b093e6834
Yang Ni [Tue, 8 Mar 2016 21:09:11 +0000 (21:09 +0000)]
Merge "Revert "Set flags in RS JNI calls for rsObj creation""
am:
5a6d9b6656
* commit '
5a6d9b6656b3ebd8956c4a129b17c372585d23a9':
Revert "Set flags in RS JNI calls for rsObj creation"
Yang Ni [Tue, 8 Mar 2016 21:02:25 +0000 (21:02 +0000)]
Merge "Revert "Set flags in RS JNI calls for rsObj creation""
Yang Ni [Tue, 8 Mar 2016 21:01:54 +0000 (21:01 +0000)]
Revert "Set flags in RS JNI calls for rsObj creation"
This reverts commit
ad88055821a7aba3318f066c4e5f87bd0315462c.
Change-Id: I53a3f59022e2607216f4dd89bc2e28e0bd987785
Yi Kong [Tue, 8 Mar 2016 19:12:48 +0000 (19:12 +0000)]
Yi Kong [Tue, 8 Mar 2016 19:09:10 +0000 (19:09 +0000)]
Yi Kong [Tue, 8 Mar 2016 09:21:18 +0000 (09:21 +0000)]
Track libcore change
f121f31fd91c5a557225cd6a97418e716529eb2d
Bug:
27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a
Calin Juravle [Tue, 8 Mar 2016 15:50:19 +0000 (15:50 +0000)]
Update DexFile.getDexOptNeeded in framework
Partial cherry pick from commit
693f997cc8b8c2ba8d3ed29627b2641dd86392a5
Change-Id: I0fe34541e3cf77fb6e6dbe689b7cf55cb78dbe05
Calin Juravle [Tue, 8 Mar 2016 13:58:18 +0000 (13:58 +0000)]
Fix VMRuntime.registerAppInfo usage
Partial cherry pick from git commit
d479b52d12fc782f18df6b5ae15c19e022f0ec14
Change-Id: I1de6e7eda23e6029c87896d8c01e063b98e39f74
Shubham Ajmera [Tue, 8 Mar 2016 02:27:10 +0000 (02:27 +0000)]
Port OpenJDK8 java.util.*SummaryStatistics & add tests
Ported OpenJDK8 java.util.DoubleSummaryStatistics,
java.util.IntSummaryStatistics, java.util.LongSummaryStatistics.
Based on openJdk 8u40 source & iam@ stream change in
ag/872080
Bug:
27426738
Change-Id: I54f3fba1142327f990c0a71acbbef0b7bb0e0a27
Adam Powell [Mon, 7 Mar 2016 23:50:51 +0000 (23:50 +0000)]
Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"
am:
9d39648de4
* commit '
9d39648de4c9070ddc770d301e822bdc72db4ba9':
Restore auto-launch behavior for ACTION_CHOOSER with a single choice
Adam Powell [Mon, 7 Mar 2016 23:46:15 +0000 (23:46 +0000)]
Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"
George Burgess IV [Mon, 7 Mar 2016 22:56:12 +0000 (22:56 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
am:
5a3ac10568
* commit '
5a3ac10568e5d729d604c90117550f253ba4b080':
Cleanup uses of sprintf so we can deprecate it.
George Burgess IV [Mon, 7 Mar 2016 22:51:03 +0000 (22:51 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
Neil Fuller [Fri, 4 Mar 2016 13:03:48 +0000 (13:03 +0000)]
Merge "Change libraries needed by layoutlib to "host" libs"
am:
709bf582cf
* commit '
709bf582cf949680da976e3f6cd5bf03396b1db1':
Change libraries needed by layoutlib to "host" libs
Narayan Kamath [Fri, 4 Mar 2016 12:59:47 +0000 (12:59 +0000)]
Neil Fuller [Fri, 4 Mar 2016 12:58:44 +0000 (12:58 +0000)]
Merge "Change libraries needed by layoutlib to "host" libs"
Narayan Kamath [Fri, 4 Mar 2016 12:54:59 +0000 (12:54 +0000)]
Narayan Kamath [Fri, 4 Mar 2016 12:47:17 +0000 (12:47 +0000)]
Narayan Kamath [Thu, 3 Mar 2016 22:35:46 +0000 (22:35 +0000)]
Track libcore change
e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
bug:
27426688
Change-Id: I75777707f96c463ea7054eda55bb532a67ca5501
Narayan Kamath [Fri, 4 Mar 2016 12:41:50 +0000 (12:41 +0000)]
Neil Fuller [Tue, 1 Mar 2016 18:46:37 +0000 (18:46 +0000)]
Change libraries needed by layoutlib to "host" libs
They are only used on host and are one of the few places
in the build that use LOCAL_JACK_ENABLED := disabled.
Bug:
27218410
(cherry picked from commit
d34e33bc831b51c62630829c188ee0039580ac60)
Change-Id: I8febfca41b3e9baaf290e53ca1449254d4cc9b46
Pirama Arumuga Nainar [Fri, 4 Mar 2016 00:09:27 +0000 (00:09 +0000)]
Merge changes I3651e5ae,I37058468
am:
f033a6ca9f
* commit '
f033a6ca9f1ebe810b511861267665948bcd019e':
[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
Pirama Arumuga Nainar [Fri, 4 Mar 2016 00:06:04 +0000 (00:06 +0000)]
Merge changes I3651e5ae,I37058468
* changes:
[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
Pirama Arumuga Nainar [Wed, 2 Mar 2016 04:37:19 +0000 (20:37 -0800)]
[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
http://b/
27251511
Handle FLOAT_16 case to PER_ARRAY_TYPE macro to enable untyped variants
of Allocation-copy functions.
Untyped variants of Allocation-copy functions call
validateObjectIsPrimitiveArray(), with checkType parameter set to true,
to validate and obtain the Element type of the Allocation. When
checkType is true, validateObjectIsPrimitiveArray() returns the actual
Element type of the Allocation (instead of the canonical SIGNED type).
Because of this, FLOAT_16 element type can reach the JNI layer,
necessitating this change to PER_ARRAY_TYPE macro.
Change-Id: I3651e5ae0ab0cd6bb4ad3157841e2910ac8699dc
(cherry picked from commit
85e8c51dbf8dc774ecfd09981ac6a8bf1b75f464)
Pirama Arumuga Nainar [Fri, 26 Feb 2016 17:16:17 +0000 (09:16 -0800)]
[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
http://b/
27251511
Allow copyTo(short[]), copyFrom(short[]), and their 1D range and 2D
range variants to copy data between short[] arrays and Float16
Allocations.
Change-Id: I370584685c3b773c165bd718974ca736ed548339
(cherry picked from commit
f51bb356deeb8a22414fb44cede4b8618c4b57ba)
Narayan Kamath [Thu, 3 Mar 2016 22:23:37 +0000 (22:23 +0000)]
Track libcore commit
6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
bug:
27426688
Change-Id: I0ac1dd9a1632b42235744602e9384b8049556965
Lajos Molnar [Thu, 3 Mar 2016 17:29:04 +0000 (17:29 +0000)]
Merge "media: correctly return cached size for MediaDataSource"
am:
6ca2cb4991
* commit '
6ca2cb499112871fd840597184dc75ba26fdeae8':
media: correctly return cached size for MediaDataSource
Lajos Molnar [Thu, 3 Mar 2016 17:24:00 +0000 (17:24 +0000)]
Merge "media: correctly return cached size for MediaDataSource"
Dimitry Ivanov [Thu, 3 Mar 2016 17:08:20 +0000 (17:08 +0000)]
Merge "Create linker-namespace for the classloader"
am:
c6b66d3fb7
* commit '
c6b66d3fb763f7ebb9c3946377a3008bad315bc3':
Create linker-namespace for the classloader
Dimitry Ivanov [Thu, 3 Mar 2016 17:05:15 +0000 (17:05 +0000)]
Merge "Create linker-namespace for the classloader"
Lajos Molnar [Thu, 3 Mar 2016 01:03:19 +0000 (17:03 -0800)]
media: correctly return cached size for MediaDataSource
Bug:
27431229
Change-Id: I884e43960789c139b48964deba8f56b3bc3ba590
Narayan Kamath [Thu, 3 Mar 2016 11:49:15 +0000 (11:49 +0000)]
Narayan Kamath [Thu, 3 Mar 2016 11:43:49 +0000 (11:43 +0000)]
Merge "Track libcore change
2c423c81bfa731df2577a."
Shasidhar Ganiga [Wed, 2 Mar 2016 23:57:28 +0000 (23:57 +0000)]
Merge "Fix for framework reboot on connecting to TV through HDMI."
am:
7585cbfd34
* commit '
7585cbfd34a46bc8332bf066a5d0f69677d3a7e1':
Fix for framework reboot on connecting to TV through HDMI.
Michael Wright [Wed, 2 Mar 2016 23:45:38 +0000 (23:45 +0000)]
Merge "Fix for framework reboot on connecting to TV through HDMI."
George Burgess IV [Wed, 2 Mar 2016 21:34:44 +0000 (13:34 -0800)]
Cleanup uses of sprintf so we can deprecate it.
Change-Id: Ic66abfb547cd5551c47e03d604e65f83c84c597f
Yang Ni [Wed, 2 Mar 2016 18:24:55 +0000 (18:24 +0000)]
Merge "Set flags in RS JNI calls for rsObj creation"
am:
b21cb13010
* commit '
b21cb13010d903e84ed34a94e87a348c891dd587':
Set flags in RS JNI calls for rsObj creation
Yang Ni [Wed, 2 Mar 2016 18:11:08 +0000 (18:11 +0000)]
Merge "Set flags in RS JNI calls for rsObj creation"
Narayan Kamath [Wed, 2 Mar 2016 14:36:59 +0000 (14:36 +0000)]
Narayan Kamath [Wed, 2 Mar 2016 14:30:08 +0000 (14:30 +0000)]
Track libcore change
2c423c81bfa731df2577a.
bug:
27423298
Change-Id: Ibc5094812af4446ac6ff25158ca4dd0ce8271e2a
Narayan Kamath [Wed, 2 Mar 2016 14:14:50 +0000 (14:14 +0000)]
Merge "Track libcore change
2729b8c4d26170."
Narayan Kamath [Wed, 2 Mar 2016 13:35:23 +0000 (13:35 +0000)]
Track libcore change
2729b8c4d26170.
bug:
27423298
Change-Id: I2d2eedd108896d5a027f06e159222a41bdcb3cb5
Przemyslaw Szczepaniak [Tue, 1 Mar 2016 15:59:19 +0000 (15:59 +0000)]
Przemyslaw Szczepaniak [Tue, 1 Mar 2016 15:54:59 +0000 (15:54 +0000)]
Przemyslaw Szczepaniak [Mon, 29 Feb 2016 17:23:07 +0000 (17:23 +0000)]
Track libcore change
e42e99816ad6c0626564aaabcf636e8febc1edc6
Change-Id: I7b111ba383751de26c53fcdd8640115d7ddb3890
Deepanshu Gupta [Mon, 29 Feb 2016 10:37:16 +0000 (10:37 +0000)]
Merge changes from topic \'java_8_layoutlib\'
am:
5d5fd21e0a
* commit '
5d5fd21e0aa23662d513825a5054b3b3970b3118':
Switch LayoutLib to Java 8
Move LayoutLib to Java 8
Neil Fuller [Mon, 29 Feb 2016 10:33:29 +0000 (10:33 +0000)]
Merge changes from topic 'java_8_layoutlib'
* changes:
Switch LayoutLib to Java 8
Move LayoutLib to Java 8
Akira Oshimi [Wed, 25 Feb 2015 04:57:28 +0000 (13:57 +0900)]
Close notification panel when user button is tapped
When multi-user is disabled and user button on the notification panel
is tapped, the contact app is displayed behind the notification panel.
The notification panel should be closed
when the contact app is launched.
Change-Id: I66ebcb66c898dfebe1d09b798f750f696c360da8
Baligh Uddin [Sat, 27 Feb 2016 16:15:28 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Sat, 27 Feb 2016 07:06:47 +0000 (23:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I13a51d705fc1cf7780f67c5c7ff8ef4c232eb8de
Baligh Uddin [Sat, 27 Feb 2016 06:30:39 +0000 (22:30 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Ic252b8bb52174e72afa6c2099e18437f0d464ef7
Dimitry Ivanov [Tue, 23 Feb 2016 22:25:50 +0000 (14:25 -0800)]
Create linker-namespace for the classloader
With this change ApplicationLoaders.getClassLoader()
creates linker-namespace for the classloader at the
construction time. Before this change the namespace
was created on first load of a jni library.
With this change we ensure that every classloader
has initialized namespace associated with it.
As an additional advantage we now can avoid storing
namespace-specific fields in the classloaders.
Bug: http://b/
27189432
Bug: http://b/
22548808
Change-Id: I3b160bd478a55171008682c40b2ebc13bdbd9882
(cherry picked from commit
a55c7f15a3c386ec643f21eeb2f4e9fd7b03ba70)
Nicolas Geoffray [Fri, 26 Feb 2016 14:46:53 +0000 (14:46 +0000)]
Merge "Fix ASAN builds after app_process change."
am:
d21b6420d2
* commit '
d21b6420d2a321168547bee8885b50e598823255':
Fix ASAN builds after app_process change.
Nicolas Geoffray [Fri, 26 Feb 2016 14:45:02 +0000 (14:45 +0000)]
Merge "Fix ASAN builds after app_process change."
Dimitry Ivanov [Fri, 26 Feb 2016 13:37:14 +0000 (13:37 +0000)]
Merge "zygote to preload public native libraries"
am:
38b839ca08
* commit '
38b839ca085f62c5ba06336461e3ae96b849a34e':
zygote to preload public native libraries
Nicolas Geoffray [Fri, 26 Feb 2016 13:16:50 +0000 (13:16 +0000)]
Fix ASAN builds after app_process change.
Bug:
27245894
(cherry picked from commit
573895bbea7cf349d615606004cdb85ba2ca814d)
Change-Id: I1b879f23cd2bb49070cbfee40ae1b8a586a328dc
Nicolas Geoffray [Fri, 26 Feb 2016 13:33:51 +0000 (13:33 +0000)]
Merge "zygote to preload public native libraries"
Dimitry Ivanov [Mon, 22 Feb 2016 19:22:11 +0000 (11:22 -0800)]
zygote to preload public native libraries
Preload public native libraries when starting a zygote
This lets other users of libnativeloader (like dex2oat)
avoid unnecessary cold loads of libandroid.so which could
take up to a second.
Bug: http://b/
27245894
(cherry picked from commit
b0824979be2653ba300382b52c1b1236fd44f0de)
Change-Id: I04a640c104dba5b585a59d63270e81b6c9ad6f7e
Dimitry Ivanov [Thu, 25 Feb 2016 19:41:00 +0000 (19:41 +0000)]
Merge "Construct classloader for apps with no java code"
am:
33e7677665
* commit '
33e7677665c38507e58245c92101acef01ff302d':
Construct classloader for apps with no java code
Dimitry Ivanov [Thu, 25 Feb 2016 19:35:55 +0000 (19:35 +0000)]
Merge "Construct classloader for apps with no java code"
Baligh Uddin [Thu, 25 Feb 2016 16:21:52 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:21:50 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:21:06 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:54 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:33 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:30 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master