tree 7d25706f688796b3cc20a61ab2cf202286f1398f
parent fc9bedb4b201aaa7c25330d9ea553f786271d727
parent cecabf48ae85943b9c0e5b4805299794f5f3b857
author Baligh Uddin <baligh@google.com> 1419744906 +0000
committer android-build-merger <android-build-merger@google.com> 1419744906 +0000

am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: cecabf4  -s ours

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