OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ecfe1a5e17...
authorBill Yi <byi@google.com>
Thu, 16 Jun 2016 22:15:59 +0000 (22:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 22:15:59 +0000 (22:15 +0000)
am: 7085bb345d  -s ours

Change-Id: If6b7101a6e4cd6c81e41d98a30b65c231d574f2a


Trivial merge