tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 9ebe78cb400a1d6c659c0476069fb61f66d9a3fc
parent 0ef0c8e5c89479b02a98c57df44416d7b0bc7d5b
author Baligh Uddin <baligh@google.com> 1445311839 +0000
committer android-build-merger <android-build-merger@google.com> 1445311839 +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
am: 0ef0c8e5c8  -s ours

* commit '0ef0c8e5c89479b02a98c57df44416d7b0bc7d5b':
  Import translations. DO NOT MERGE