OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: b9aa9b47e7 -s ours
authorBaligh Uddin <baligh@google.com>
Thu, 23 Jun 2016 00:52:11 +0000 (00:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 00:52:11 +0000 (00:52 +0000)
commit4e1518aab426abf93a8bb3c1653f4bc73792d9e8
tree5abe61eabf83c45bd92d68c9135ca7a362704a2d
parentc33f3fd0e441a756dd0cdc30c48fd3950ba35a2a
parenta0b34b32c3ddf7d0fb6c1dd57b3de8bba1573dd1
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: b9aa9b47e7  -s ours
am: a0b34b32c3  -s ours

Change-Id: I85c704338b0a68a5743ba346ee361e0a3310b821