| commit | b3adc50504e24036fae24aaac58162e8c6d1b7ae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 15:12:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 15:12:18 2015 +0000 |
| tree | 0ec298b6fda641f7eef80bda332be13aa0613fd8 | |
| parent | 2e139d5b4cad5f5a1feead93cdf42a8aaf52902e [diff] | |
| parent | 45ac66f4b9b80b9fae9d925cd98a709b65cd41a7 [diff] |
am 45ac66f4: (-s ours) am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE * commit '45ac66f4b9b80b9fae9d925cd98a709b65cd41a7': Import translations. DO NOT MERGE