OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 14 Jul 2016 20:47:18 +0000 (20:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 20:47:18 +0000 (20:47 +0000)
commit87df5f6ded502f088cd530d90c08f238fbb375a0
treeaa345ce9952810b191a0a1ab4d50454088af1f7d
parenta035048d358b99b129c428c326f06cbbb50fef2f
parent9cdfb9d781d0af0ee25eea0f7cbfa8581a400cc5
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 9cdfb9d781  -s ours

Change-Id: I861d47e86d5695382ecf2e3093e567f710273c1c