| commit | 69988b3cee1df8fd1fee9ae2041a0981cc491bd2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 14:22:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 14:22:21 2015 +0000 |
| tree | e21a1bfabd92e2b3198339731697b990fd0cbaf7 | |
| parent | fec413dbeae1a5afef833ad883d36bdd2a6af105 [diff] | |
| parent | ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826 [diff] |
am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours * commit 'ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826': Import translations. DO NOT MERGE