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