| commit | 2c0cc6d34b38a09e75f1c959afc8d50bc84de512 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 13:28:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 13:28:57 2015 +0000 |
| tree | de0e85fe07b1afb57f2c2ad2bd3ba55f677c1968 | |
| parent | e864ebe1f970b4711ec1274430e306e71146b3d7 [diff] | |
| parent | e3cfc50cb04c8965c9f286e874ec6d2f4f446e03 [diff] |
am e3cfc50c: (-s ours) am b224ec18: (-s ours) am fd9b7cf0: (-s ours) am e3d8faa5: (-s ours) am 4f7f05a0: (-s ours) am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE * commit 'e3cfc50cb04c8965c9f286e874ec6d2f4f446e03': Import translations. DO NOT MERGE