tree f18b4f23760535840cf3c0410eb17d186883dd01
parent 38f8eb343f1055f552d437560353aa3701bea764
parent bf97e346786042f09220356346f964ba2f2f857b
author Bill Yi <byi@google.com> 1464018549 +0000
committer android-build-merger <android-build-merger@google.com> 1464018549 +0000

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

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

Change-Id: I8e1d043079e68b20c9de3d186916eca7938d4a71