OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d -s ours
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:21:17 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:21:17 +0000 (15:21 +0000)
commitcb5a8a9e6a76307b44bc83133ebbfe07859c450c
treeed69da0ea435ffa905f235fd97050587b04356f9
parent9eaa1a71c428def5984e39abad986e415f28e21d
parent99e984e15083a3c0790b59a26bf96496ec6e311d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d  -s ours
am: 99e984e  -s ours

* commit '99e984e15083a3c0790b59a26bf96496ec6e311d':
  Import translations. DO NOT MERGE

Change-Id: I68ad93474054466af0eb9bcf2fd3452d7c1ac273