tree 4166f35e207a2990be6928d39dcc40a24f208838
parent 3e075db78e3a8b02c87b899bb492121b66a07d9d
parent c84e354cfdd3380acbbd086c1f40511afa79e9ae
author Geoff Mendal <mendal@google.com> 1422494581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422494581 +0000

am c84e354c: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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