| commit | 31f6aaf48cd6cc0792f28f629187199af309808b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 21:04:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 21:04:30 2014 +0000 |
| tree | d63e14647b97b2ed0469dd79450d5cb22586428b | |
| parent | 9ecba4e7d5406607429a56090ab8deb1d3bb731d [diff] | |
| parent | 5b5f6ddfa84ec9e90c8b77899bb1a6096d1b1c56 [diff] |
am 5b5f6ddf: (-s ours) am cf71886c: (-s ours) am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '5b5f6ddfa84ec9e90c8b77899bb1a6096d1b1c56': Import translations. DO NOT MERGE