OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 16 Jun 2016 10:03:34 +0000 (10:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:03:34 +0000 (10:03 +0000)
commitf924f2130f0763ba68fd17292be904cda392e2ec
tree3ffa5e33e19e34eb670e3f939fd86e1cc3ffe48e
parent0630d92064e86334519207129b446b45388a5743
parent65266b99d2b226e5b6cc906cfeb3d31483221ffc
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2  -s ours

Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b