tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent d090146ad86f0cecf3c76abd8b2deeae37582aa1
parent 56985a1867525557fd15a1b74fc768945ebc56c6
author Baligh Uddin <baligh@google.com> 1445303553 +0000
committer android-build-merger <android-build-merger@google.com> 1445303553 +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

* commit '56985a1867525557fd15a1b74fc768945ebc56c6':