tree fd1ba7150071cb166993da1decdd3f80549c7907
parent 20367a4a6d6927b907d1f0bdc63c273c49733e90
parent 6f7a528b43a3e5b22e96fd4f18bdd7d3812d22e6
author Baligh Uddin <baligh@google.com> 1445310032 +0000
committer android-build-merger <android-build-merger@google.com> 1445310032 +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

* commit '6f7a528b43a3e5b22e96fd4f18bdd7d3812d22e6':