OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours
authorBill Yi <byi@google.com>
Tue, 31 May 2016 16:40:18 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 16:40:18 +0000 (16:40 +0000)
commit5b21cc1513030e5fcdb84e561d54e53e744bea52
tree59895c319312ebb341196638ed876453332e8fb0
parent54ce05d3e373e7cc6d5b4b0f6a19de0c9e3c0728
parent13e25431cdd20e05acfa69f26351d86881598619
Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd  -s ours
am: 13e25431cd  -s ours

* commit '13e25431cdd20e05acfa69f26351d86881598619':
  Import translations. DO NOT MERGE

Change-Id: Ibc124314e722d3e5eb327ad65175846ea00220e4