| commit | 6b26d9d4fa6fa1e799beccbafab3278af09bf93d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:00:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:00:33 2015 +0000 |
| tree | f51bfa4fe52218248dc4f03eab6188b76a183b45 | |
| parent | 043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5 [diff] | |
| parent | 256e2ffddf7e22bdf201c44a880a36e73b8f8fbe [diff] |
am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '256e2ffddf7e22bdf201c44a880a36e73b8f8fbe':