| commit | 468a40e55e755c23eb50e66b82645cd3c2c1fa9e | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Jul 23 19:04:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 23 19:04:34 2014 +0000 |
| tree | 8e0d4aac5f3f79f59f8e00c906a8c9dd31d36edf | |
| parent | 84ab885002deb8ad7d42b358464dde3b9ccca10e [diff] | |
| parent | 9871afafd29015856be3da4920809e77e1a1321b [diff] |
am 9871afaf: resolved conflicts for merge of 525f2f30 to lmp-dev-plus-aosp * commit '9871afafd29015856be3da4920809e77e1a1321b': ART: Make run tests out of oat tests