tree d3e13a0518c3f5a8177cb83999540599da270c34
parent 7c2de39f8a19ab08f35300d701f42d1bfd6c6ee4
parent b776aa7053d6c2a382779c2c5b53d3c9f2b10e92
author Brian Carlstrom <bdc@google.com> 1403144196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403144196 +0000

am b776aa70: am 865f0db0: Merge "Switch from core to core-libart"

* commit 'b776aa7053d6c2a382779c2c5b53d3c9f2b10e92':
  Switch from core to core-libart