OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:39:48 +0000 (03:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:39:48 +0000 (03:39 +0000)
commit71731a6d1af2552cf0f806c2cc18a1e0d2ea07c5
treeb3348af0e2af1937f4ec317971714c153f9836df
parent059a43818bf968795c8c5f418ea9e830b8f23d19
parenta9a03b5d7ee4a54a699737c896886e96184ec62c
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: a9a03b5d7e  -s ours

Change-Id: I54902004b078c6596c43eb0d35bf8376b6c7f11a