tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent 00e827c70cb4213ee05140157006a37d12662448
parent 522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12
author Baligh Uddin <baligh@google.com> 1445306728 +0000
committer android-build-merger <android-build-merger@google.com> 1445306728 +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 am: 909bcceeb4  -s ours
am: 522d4ac6fe  -s ours

* commit '522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12':