tree fd1ba7150071cb166993da1decdd3f80549c7907
parent 6c9c94c5959355a75821b4f253d420339fe6f874
parent 9d5a25ea2b3a1421f984366e76f96e893347f7fe
author Baligh Uddin <baligh@google.com> 1445311727 +0000
committer android-build-merger <android-build-merger@google.com> 1445311727 +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 am: f4dd532c3e  -s ours am: 9c26a98ebf  -s ours
am: 9d5a25ea2b  -s ours

* commit '9d5a25ea2b3a1421f984366e76f96e893347f7fe':
  Import translations. DO NOT MERGE