OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Wed, 18 May 2016 18:04:27 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 May 2016 18:04:27 +0000 (18:04 +0000)
commitc3190d5fb209139f3b2ebeb03ec85ea7fb05bd93
tree6f4dc1575d3a068174e5525716b695473a5191c1
parent5ac773c8f7a6edef2d72fb9ce1b2fd8a90740978
parente6ee2d7e1188a0397bdd198708a0c87b8bbe00d7
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e6ee2d7e11  -s ours

* commit 'e6ee2d7e1188a0397bdd198708a0c87b8bbe00d7':
  Import translations. DO NOT MERGE

Change-Id: Icbd5a05067e61eb95513823ad9f90840dd1f0674