OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 12:59:33 +0000 (12:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 12:59:33 +0000 (12:59 +0000)
commit30e23079f3b73a935d2de17bffae01af8ee6a2aa
tree1debaa245064cd7f0be68b52b76d0232f29f88ac
parent2665d15b104be8042a363aafec49e6eac1565834
parentad145e503eee7aba6d61923b39b39c343021a737
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46  -s ours
am: ad145e5  -s ours

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

Change-Id: I3a93748beebe7a50dbe3c1b19b2bf0c9b58af54d