| commit | 116b058bfb410c2c3bf0c9436645c842406d99b5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:00:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:00:38 2015 +0000 |
| tree | f51bfa4fe52218248dc4f03eab6188b76a183b45 | |
| parent | 8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce [diff] | |
| parent | 013b37a7e91e27eb060a6a23ac607a7172f2b058 [diff] |
am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '013b37a7e91e27eb060a6a23ac607a7172f2b058':