tree af83d9a4aaebe9dae2d5e2c4a276ca0f5848bfb1
parent 29b23ab6844c5ecac0fd43349c2f95c6fa91af7f
parent 1a898e68528819a2c0f1d6024cacb40d6e929bac
author Baligh Uddin <baligh@google.com> 1412142376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412142376 +0000

am a09b5049: (-s ours) am f165a397: (-s ours) am 026c2ea2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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