| commit | 070e7bf9c737392c09e8438dae7a4c772075929b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:19 2015 +0000 |
| tree | 547117f668ea31f8424844206e27f34c81ed9547 | |
| parent | 447a1008c638706092aae7620079060ec3a0c74c [diff] | |
| parent | c683cef233646d21e21e49df095836a4986005dd [diff] |
am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE * commit 'c683cef233646d21e21e49df095836a4986005dd': Import translations. DO NOT MERGE