OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 914376787b...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:10:58 +0000 (05:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:10:58 +0000 (05:10 +0000)
am: 324990b5e3  -s ours

Change-Id: Icc0fb526666ab153a18521d6d376914c61636328


Trivial merge