tree 4bad6f467acfcf0ff51177aa92217cdc23c4d7cb
parent 7e683b024f5be78000d4b2a55de6b513a94e3960
parent f62cf88d0464c3741319f674bfb0836a08308c88
author Baligh Uddin <baligh@google.com> 1408119739 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408119739 +0000

am f62cf88d: (-s ours) am 4069b050: (-s ours) am 2ba60e4a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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