| commit | 01300e57849f8501c959ffa763bae12b964cbd44 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Jul 14 20:39:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:39:51 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | e0352f33a4dd29d54302e4c2f4cbb64deefe34e8 [diff] | |
| parent | 0c68a828134b03dedf4d9ebc5c6d0ccd0b722b29 [diff] |
am 0c68a828: am 2596abd8: am 8078b294: Merge "Revert "ART: Key-Value Store in Oat header"" * commit '0c68a828134b03dedf4d9ebc5c6d0ccd0b722b29':