| commit | a7c5a0d5b14d9c813e5777ab1de04f07d2b444a4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:53:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:53:29 2015 +0000 |
| tree | 4e9145baf1e622b5f8105235f1fe2f7b068cb185 | |
| parent | 4852ba6c43cea3946215ce7de9c6b6eca353fcf4 [diff] | |
| parent | bbcba8f1bca4d5d28aa239e54edc269f03edb4ba [diff] |
am 0a3215ac: (-s ours) am 07fe5378: (-s ours) am a531220f: (-s ours) am a3d5eeda: (-s ours) am 1f19a311: (-s ours) Import translations. DO NOT MERGE * commit '0a3215acce78eb6bb3d8a4a29d722b6446c8d6ab': Import translations. DO NOT MERGE