OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: b141b6399f...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 21:10:55 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:10:55 +0000 (21:10 +0000)
commitbe8b90e499e101e39a56c0d48f79ae6ec524f212
treef81e1a7191cd384e35fee56653df3d8ddc41fd50
parented373df02ef8be7670e610d5ebe37ec03d46ce64
parent22411c6e53434fe8e8cd2e24bb2300e3a7b0b811
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: b141b6399f  -s ours am: 0f1467c5f1  -s ours
am: 22411c6e53  -s ours

Change-Id: Ie2c025ddecd6e1e02dc7c358853c6c882be296db