OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Tue, 19 Apr 2016 15:55:01 +0000 (15:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 15:55:01 +0000 (15:55 +0000)
commite68cb3c03f784e08ae2f0f52f86a241fac4f17d3
tree6585b7f769f511dd74732ecfd6b6671e0f81b39c
parent6e1f3bddc7129dc9de2ca00a412af3589e023704
parent30fc04a99cb84058319abdf16b8c5f144c9b1924
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 30fc04a  -s ours

* commit '30fc04a99cb84058319abdf16b8c5f144c9b1924':
  Import translations. DO NOT MERGE

Change-Id: I41d8de22a1800edd3f050372c8fda3a36da0b9c1