tree cc2e55e702e68c3d95b22dd83c90f73f2001f68f
parent 3c50c030e69c2f14fcb7acccfa981bda3eb77460
parent 93e807485edc5de8b549b7d5a5ce7e52f5315094
author Bill Yi <byi@google.com> 1465266468 +0000
committer android-build-merger <android-build-merger@google.com> 1465266468 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93e807485e  -s ours

* commit '93e807485edc5de8b549b7d5a5ce7e52f5315094':
  Import translations. DO NOT MERGE

Change-Id: Ib8d00f5d63a48aa529393edc29c226c11824c476