tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 51160caf9cb3f85a5ad3e89cbf794563c017c7af
parent 669ef65afbb3799333b4e961371b920653ec870f
author Baligh Uddin <baligh@google.com> 1445303532 +0000
committer android-build-merger <android-build-merger@google.com> 1445303532 +0000

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19  -s ours am: bfe4347964  -s ours
am: 669ef65afb  -s ours

* commit '669ef65afbb3799333b4e961371b920653ec870f':