tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent fd58ec9eff0481782d1f4d1611a5cc4bc1ddabe6
parent 8c0efbe340110eef9b0b3d4fcd471bcc053f1ef9
author Baligh Uddin <baligh@google.com> 1445305757 +0000
committer android-build-merger <android-build-merger@google.com> 1445305757 +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

* commit '8c0efbe340110eef9b0b3d4fcd471bcc053f1ef9':