OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 90730d5542...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 21:26:52 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:26:52 +0000 (21:26 +0000)
am: 37d27a9b7b  -s ours

Change-Id: I512b4fc866bd07e6e774ff0d4e907db0e0394835


Trivial merge