| commit | d6662e7837482396e061ebc1c4bfcdb774f09f7a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 06:21:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:21:53 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | 54dc3d161655693062b65fda9a50303bb6c3e54e [diff] | |
| parent | ca4f3f09e34e6807b76d7db5c28545bde5f4f8c0 [diff] |
am ca4f3f09: (-s ours) am 30ebce48: (-s ours) am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'ca4f3f09e34e6807b76d7db5c28545bde5f4f8c0':