OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 12af7eb3ab...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 21:26:57 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:26:57 +0000 (21:26 +0000)
commit33f18eae02cbf2ed5099215b9bb4449d537f3243
treef81e1a7191cd384e35fee56653df3d8ddc41fd50
parent165a9c3405fda1bdc85735f75c59d9f326202648
parenta03869b29673479024387ad9a79cfaed8e614606
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 12af7eb3ab  -s ours am: 2fc6dfb440  -s ours
am: a03869b296  -s ours

Change-Id: I98ab1b5e5cea8124c59a99007610b6c8ec809762