tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent 30c651297316564dfd20af17353a2059d95a00b3
parent 00d2190a26c66fe9053b1fcbd612cc410ddd864d
author Baligh Uddin <baligh@google.com> 1445307799 +0000
committer android-build-merger <android-build-merger@google.com> 1445307799 +0000

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce  -s ours am: eb8ce94244  -s ours am: 56985a1867  -s ours am: a03da71ae3  -s ours am: 8c0efbe340  -s ours am: 04e030ea81  -s ours
am: 00d2190a26  -s ours

* commit '00d2190a26c66fe9053b1fcbd612cc410ddd864d':