tree 60898b90cdbe558feee90831b37d9e668827c3fd
parent 19f65359b90d2a69b044936b81f4fd4a3d6aa32e
parent c64f5ca02b16ebece40c21f401f75c7ace8178ac
author Geoff Mendal <mendal@google.com> 1426512148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426512148 +0000

am c64f5ca0: (-s ours) am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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