OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 22:21:49 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 22:21:49 +0000 (22:21 +0000)
commit1f055cb81d40e4c2460c4421a44e1c9251a1313c
tree88e7303f8b27de496ff7afaf714169bf8631286a
parent8a1d371239ec88bb85c38c2f484625d401a5ed8e
parentedafefc1edb806b0a4f350b656c4f08f5c3d90e7
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: edafefc1ed  -s ours

* commit 'edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
  Import translations. DO NOT MERGE

Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4