tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent e0342fad73f011b65ee566a652ba556566f3533b
parent 4c6f47c15eb13f297be5d19423eebb6f1b683b11
author Baligh Uddin <baligh@google.com> 1445311337 +0000
committer android-build-merger <android-build-merger@google.com> 1445311337 +0000

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours
am: 4c6f47c15e  -s ours

* commit '4c6f47c15eb13f297be5d19423eebb6f1b683b11':
  Import translations. DO NOT MERGE