tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent ea9ad5cead9ad894fb670476bb5381198cdcf2de
parent 03937ac5d7c2dae4d730bc6cea6d42c63ad13181
author Baligh Uddin <baligh@google.com> 1445304631 +0000
committer android-build-merger <android-build-merger@google.com> 1445304631 +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
am: 03937ac5d7  -s ours

* commit '03937ac5d7c2dae4d730bc6cea6d42c63ad13181':