commit | 4172b16afadaf00168b663464d122213f664923c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:00:40 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:00:40 2015 +0000 |
tree | f51bfa4fe52218248dc4f03eab6188b76a183b45 | |
parent | 116b058bfb410c2c3bf0c9436645c842406d99b5 [diff] | |
parent | 92aaaa88d31e21ca72d24ad047195779be83bdcd [diff] |
am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '92aaaa88d31e21ca72d24ad047195779be83bdcd':