| commit | d186d919d6bf0ee5ac02856db90e6d755ca625dd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 17:08:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 17:08:27 2014 +0000 |
| tree | 3f849c6e853990a29585410d0ddacfab6f05acb7 | |
| parent | cc46a0e3f276174cb68ddf4fdf4edc30f86235bd [diff] | |
| parent | 1d5af7b743fa32ca291d57a0b8b6998f7761c94d [diff] |
am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '1d5af7b743fa32ca291d57a0b8b6998f7761c94d': Import translations. DO NOT MERGE