| commit | f7a20d5349288f5efb7c94c60d7459b335fb9f98 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 29 22:57:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 22:57:36 2015 +0000 |
| tree | 445e9c5a0a3d466d0297d5b9ee82dd17cb3afa04 | |
| parent | 07c2561d80fba5b3764177aa03dc4496cbe9b47e [diff] | |
| parent | e387dccbacb9119fec02a54d26440ef5a2ee0ce1 [diff] |
am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE * commit 'e387dccbacb9119fec02a54d26440ef5a2ee0ce1': Import translations. DO NOT MERGE