OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c -s ours
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:21:13 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:21:13 +0000 (15:21 +0000)
commitdd11387dd1dc662c73763935afd1c1d496e12222
treeed69da0ea435ffa905f235fd97050587b04356f9
parent5f9c41bfdfbd8801dd379b6930d4f45406cc74e5
parent00e13bb466bc1636364def5c69271bcc5edeb61a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c  -s ours
am: 00e13bb  -s ours

* commit '00e13bb466bc1636364def5c69271bcc5edeb61a':
  Import translations. DO NOT MERGE

Change-Id: I6eb3b6768bafdc7af709c9a216159d476ae3393f