| commit | 7424f8c587fb4802d4b923e9b512f66a28f24c97 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:00:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:00:35 2015 +0000 |
| tree | f51bfa4fe52218248dc4f03eab6188b76a183b45 | |
| parent | 6b26d9d4fa6fa1e799beccbafab3278af09bf93d [diff] | |
| parent | 585f624ba50bc34eb2661bf2f6d3e266d1a55acf [diff] |
am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':