tree b8dcd7648281d6eb09d2957516052f61de946f39
parent e869b3981506537dabbd1011df94f1e69ce84495
parent 31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96
author Geoff Mendal <mendal@google.com> 1439231003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439231003 +0000

am 31a0f46f: (-s ours) am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96':
  Import translations. DO NOT MERGE