OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Wed, 8 Jun 2016 13:10:46 +0000 (13:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 13:10:46 +0000 (13:10 +0000)
commit5b96cafec832787b2780c200457ef075fcde013d
tree0b7a7fc0a6ebc1618d4c0d46a1d0aa2d3db8e2a9
parent26e9a5c9f858b0a2ca5763424d027c9c25354fd6
parente573989e059d6d2db7047e23bf992f1b153ebdc4
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: e573989e05  -s ours

Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c