| commit | 134663763197dc32b51e94f43ffb7ca323262cac | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 30 18:28:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 30 18:28:24 2014 +0000 |
| tree | 748ef459634874db4185a8ad6b171d9b29cf6bcd | |
| parent | f64541d1651cc8527e4bfd94807f826dfe56e537 [diff] | |
| parent | ffac0826b35bc49b0f1bde674ecd684b3f7a86c7 [diff] |
am ffac0826: (-s ours) am 3375cc7b: (-s ours) Revert "Import translations. DO NOT MERGE" * commit 'ffac0826b35bc49b0f1bde674ecd684b3f7a86c7': Revert "Import translations. DO NOT MERGE"