OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 69e900b5dc -s ours am: 7cf69c9b91 ...
authorBaligh Uddin <baligh@google.com>
Sun, 22 May 2016 23:10:21 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 22 May 2016 23:10:21 +0000 (23:10 +0000)
commit15a0e7eeffc05a7ac356e541b3bd0a64f7142cb8
treeacab794f38d28187b2f9587293d637f4af9d3210
parent3d1b45a22de2c56ccddcb6e114f515ddd3362549
parentcd4f2383056383854edc6e79b447910f4f935a24
Merge "Import translations. DO NOT MERGE am: 69e900b5dc  -s ours am: 7cf69c9b91  -s ours" into nyc-mr1-dev-plus-aosp
am: cd4f238305  -s ours

* commit 'cd4f2383056383854edc6e79b447910f4f935a24':

Change-Id: Id75c4a4fd9296353800761e2287e9ddc4e9b85e1