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