tree 8c2e9bc1ed8c18a825a994bbc16e16e4d0b55adb
parent 83226b91d7b2301df23dc136fecd0410fdd58162
parent 612161f6899aee29a5b1a6e1ace794cbfdb4be96
author Baligh Uddin <baligh@google.com> 1443393439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443393439 +0000

am 612161f6: (-s ours) am 3315c12c: (-s ours) Import translations. DO NOT MERGE

* commit '612161f6899aee29a5b1a6e1ace794cbfdb4be96':
  Import translations. DO NOT MERGE