tree aa0af7ada95a67ff59ef99b8862c7b3c835f03ae
parent 6c79c1e156005cea6c6db41872f96c1b3100e2a1
parent bd74d3c8b1e68513571e93e00b9f5da6f1a72b47
author Baligh Uddin <baligh@google.com> 1411324584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411324584 +0000

am bd74d3c8: (-s ours) am ffd7a6f1: (-s ours) Import translations. DO NOT MERGE

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