tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent d5f09732299961917af57c4c1836d74e3f9ec2be
parent a03da71ae30ee04f2bcdb3edf1b7e362c54f2d45
author Baligh Uddin <baligh@google.com> 1445304649 +0000
committer android-build-merger <android-build-merger@google.com> 1445304649 +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

* commit 'a03da71ae30ee04f2bcdb3edf1b7e362c54f2d45':