| commit | 669ef65afbb3799333b4e961371b920653ec870f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 20 00:53:58 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 00:53:58 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b [diff] | |
| parent | bfe43479643fece25c8aeabb64b90ca9d6c028be [diff] |
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours am: bfe4347964 -s ours * commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':