| commit | 5a70daee5f5b9cf5b19bb00559f63a5a2a69c66f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 23:54:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 23:54:49 2014 +0000 |
| tree | df4827b701e3295c2379c36a8d859f130f895544 | |
| parent | 520da6e491ca1559af1b5c8d672e46604b029a15 [diff] | |
| parent | 3c172e39f3a9caf666d842f662e1529d02b551ba [diff] |
am 3c172e39: (-s ours) am 1777f6d0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '3c172e39f3a9caf666d842f662e1529d02b551ba': Import translations. DO NOT MERGE