| commit | 135a5761857f9dbd31ab51abe6466e26ddb379cd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:37:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:37:03 2014 +0000 |
| tree | 9d8b094b87a0adc4bca5e9fbf4370e8580a65da7 | |
| parent | 29b040019226d7d02a57fe76a471465d16109f0b [diff] | |
| parent | 597a75318e22ebebf9338f5dfc7d7c99aa3f23a2 [diff] |
am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '597a75318e22ebebf9338f5dfc7d7c99aa3f23a2': Import translations. DO NOT MERGE