tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 091153b7a210493987e48b8c7edd3c617ed4d5ca
parent f8431472655117f98124556640142b50f5cb7857
author Baligh Uddin <baligh@google.com> 1445310365 +0000
committer android-build-merger <android-build-merger@google.com> 1445310365 +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 am: 6f7a528b43  -s ours
am: f843147265  -s ours

* commit 'f8431472655117f98124556640142b50f5cb7857':