| commit | 8bff16b57e2d9a66e46209b8872cb237d57b0161 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 22:48:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 22:48:09 2014 +0000 |
| tree | 67dc1ea9e29e01567994c637bb82d00c5939e7e3 | |
| parent | 6070dfe791c02bcb8fcdb492ba3dfa9822c2300f [diff] | |
| parent | 086c987e15addb569ba061418d0c79568013fc79 [diff] |
am 086c987e: (-s ours) am 33333930: (-s ours) am 844b1532: (-s ours) am 2c373272: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '086c987e15addb569ba061418d0c79568013fc79': Import translations. DO NOT MERGE