tree 635fc7fdcddae457bda53a77a73f810b8e80229d
parent 7ce5064f6ad636a894bfae1629f600d634698f61
parent 2319a4debf5d30c23ecfaa0c745b7d05f472ed37
author Baligh Uddin <baligh@google.com> 1410825565 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410825565 +0000

am 2319a4de: (-s ours) am 4ae16a51: (-s ours) am ea2d4258: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2319a4debf5d30c23ecfaa0c745b7d05f472ed37':