tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent 58e3869dbfa188dad46aef00320613a0cda439e7
parent 04e030ea81ad4beb16e93e02aa71049387645741
author Baligh Uddin <baligh@google.com> 1445306757 +0000
committer android-build-merger <android-build-merger@google.com> 1445306757 +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

* commit '04e030ea81ad4beb16e93e02aa71049387645741':