| commit | 77892a62eb017f9b0c40d42b5842156550b56048 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 14:02:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 14:02:36 2015 +0000 |
| tree | e1d2a292a41ae8e91858b91b1730b36be9dc9f28 | |
| parent | 1eb767ff5e5079348dd452c77e921221b1d18e7a [diff] | |
| parent | 85f270f69c9e99bf11947744e5b5091bba5e093c [diff] |
am 85f270f6: (-s ours) am 1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '85f270f69c9e99bf11947744e5b5091bba5e093c': Import translations. DO NOT MERGE