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)
am: cd4f238305  -s ours

* commit 'cd4f2383056383854edc6e79b447910f4f935a24':

Change-Id: Id75c4a4fd9296353800761e2287e9ddc4e9b85e1


Trivial merge