| commit | 7163a0a1a68e464b00273e71851b56769aecaeb3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Mar 21 16:21:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 16:21:31 2015 +0000 |
| tree | d8dc8d8bf832a8547a0c60105a5ad50f48cf1ddf | |
| parent | d4f45766fabe3e305049dcd2f5b16b7e058a203a [diff] | |
| parent | 57d7b5f4eab81c0f9a61d5069b74ca034982a5f5 [diff] |
am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE * commit '57d7b5f4eab81c0f9a61d5069b74ca034982a5f5': Import translations. DO NOT MERGE