OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 18:16:07 +0000 (18:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 18:16:07 +0000 (18:16 +0000)
commite55d263d7ad3259474754fd4ab6aa44fc71c51d1
tree2f683b303b48022502f9ef6d49396b55f2264ba8
parent0957435430e5aa68a904069b15f4c43f9e05e14c
parent27bdfbf7946eb3e3b760169f85189168eebe60f6
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730  -s ours
am: 27bdfbf794  -s ours

* commit '27bdfbf7946eb3e3b760169f85189168eebe60f6':
  Import translations. DO NOT MERGE

Change-Id: If07970d05f867718116d0c3aebebad92a9840a12