| commit | c3b7039c31eea15b1e45471ce1fac1f336a47ad5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:01:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:01:10 2015 +0000 |
| tree | e1319641cfe21d318389fbf89d84c76c4ae9e61a | |
| parent | 4732765ae07ff7b74f3ba3e546c54e37b0ac01e6 [diff] | |
| parent | f3eb023d60d359d19169be04d417c88c130636f2 [diff] |
am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE * commit 'f3eb023d60d359d19169be04d417c88c130636f2': Import translations. DO NOT MERGE