tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 83e41764c19e5b2e1ef00b7bed6a1f8f7bca2b1e
parent 3e1c84ad8cecb69a3b417eced3ae6fbe219cc520
author Baligh Uddin <baligh@google.com> 1445311187 +0000
committer android-build-merger <android-build-merger@google.com> 1445311187 +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

* commit '3e1c84ad8cecb69a3b417eced3ae6fbe219cc520':
  Import translations. DO NOT MERGE