| commit | cc34158af0bf5318a33d74fed3e01de32a62149a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:30 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | 247aef7564be66179a988e74bd695c324e36f6dd [diff] | |
| parent | 16ad0293117e18b90d4140a4e3241cd84a1f28a9 [diff] |
am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE * commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9': Import translations. DO NOT MERGE