commit | 03937ac5d7c2dae4d730bc6cea6d42c63ad13181 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Oct 20 01:12:12 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 01:12:12 2015 +0000 |
tree | d773639dfaaf0127283b4494f54a74d44a1e324a | |
parent | 51160caf9cb3f85a5ad3e89cbf794563c017c7af [diff] | |
parent | 669ef65afbb3799333b4e961371b920653ec870f [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 * commit '669ef65afbb3799333b4e961371b920653ec870f':