tree 041d14a2f451cb39a1ab06c9287ffc8703895888
parent 69968b8c5762a8c7f6127f4aa667b8e8498c5102
parent 0ddbc6c215c34f708fcc898be25ddffc18282881
author Narayan Kamath <narayan@google.com> 1391186487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391186487 +0000

am 0ddbc6c2: Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp

* commit '0ddbc6c215c34f708fcc898be25ddffc18282881':
  CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime