Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

am: 9b3a232e0c  -s ours

* commit '9b3a232e0cab7a308a1a016b9fb5336946a60cc3':
  Import translations. DO NOT MERGE

Change-Id: If5e8c5395cc7e8a6d67694dde2a8ab8104bb1a5a
This commit is contained in:
Bill Yi 2016-06-03 23:30:32 +00:00 committed by android-build-merger
commit 3a49992de8

Diff content is not available