commit | 3eaeafbebf191a5ea5c98592f2042424b3610fbd | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Oct 20 02:05:28 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 02:05:28 2015 +0000 |
tree | 791e8a024420d9fc398174c0a56fc1722d4c771c | |
parent | 00e827c70cb4213ee05140157006a37d12662448 [diff] | |
parent | 522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12 [diff] |
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':