| commit | f1b81bf189d1764388bedd09002e8a5fa01fbf4b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 08 20:01:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 08 20:01:37 2014 +0000 |
| tree | 14acfb9a675087472d8de666173b71b20164747e | |
| parent | 86fd9278a98260e5812569381a07145221daa33d [diff] | |
| parent | 293b883c754df6c69ec9a77820d39fb55dc60018 [diff] |
am 293b883c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '293b883c754df6c69ec9a77820d39fb55dc60018': Import translations. DO NOT MERGE