tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent 10873a6d7828c8204b0397198c6e5d4c0d044ed1
parent f4dd532c3e8d63805482cfb911cd2d50454a0837
author Baligh Uddin <baligh@google.com> 1445311478 +0000
committer android-build-merger <android-build-merger@google.com> 1445311478 +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

* commit 'f4dd532c3e8d63805482cfb911cd2d50454a0837':
  Import translations. DO NOT MERGE