| commit | 1a8bc569d5f38ddcadef6f7be689e2c4c10f55aa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:32:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:32:25 2015 +0000 |
| tree | 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87 | |
| parent | 2c3102fd170eee806ae37207a49ef7a019ecd090 [diff] | |
| parent | 8593040cdeeeeddf3dcd2744d840255902894509 [diff] |
am 8593040c: (-s ours) am 717e03bd: (-s ours) Import translations. DO NOT MERGE * commit '8593040cdeeeeddf3dcd2744d840255902894509': Import translations. DO NOT MERGE