| commit | 839c3b4041fb127417c93e7dcb4e441e25f4a8c4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 17:12:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 17:12:54 2014 +0000 |
| tree | 8a7bb9a48156d84630562fae9806c72d57e571b6 | |
| parent | 45cc590299f6ad2095836a3ac4da9f88d9925cc4 [diff] | |
| parent | 85f079ee58432ca20a55d8323724d0416cd2a594 [diff] |
am 85f079ee: (-s ours) am 2f831575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '85f079ee58432ca20a55d8323724d0416cd2a594': Import translations. DO NOT MERGE