| commit | aef2069aba8aa5afbaa6229e87f2523ad8648786 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 27 18:50:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:50:32 2014 +0000 |
| tree | fbbf1af8b3273ee69e60750c87c447c0c013dd1e | |
| parent | 2ba3abe1b1953de1a431663a129edf3be344eaa1 [diff] | |
| parent | 5acaec6d6e88f303905611fe2c5e56811fe84d83 [diff] |
am 5acaec6d: (-s ours) am c4868dea: (-s ours) Import translations. DO NOT MERGE * commit '5acaec6d6e88f303905611fe2c5e56811fe84d83':