tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent 57f4c5caec1195fb9aed5085009733c8f6f43245
parent 9c26a98ebf6052cd37c90a5abeb1df8d23158905
author Baligh Uddin <baligh@google.com> 1445311600 +0000
committer android-build-merger <android-build-merger@google.com> 1445311600 +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

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