OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:15:49 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:15:49 +0000 (15:15 +0000)
commitd86467137fd28b9121984fc482e32823f477b662
tree8aad6ea0dda80be0a6fe62c63da88686c400428e
parent99e984e15083a3c0790b59a26bf96496ec6e311d
parent4316b8a09d591b64f5cb944417573fef47fc453c
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a  -s ours

* commit '4316b8a09d591b64f5cb944417573fef47fc453c':
  Import translations. DO NOT MERGE

Change-Id: I134017901ce91019dcd7eee5ed046654dfec802a