tree 3b35f82e389f4486f3299107a5705597740499a6
parent e0a3dc4ba206102bca7b0298e8de7f6b1640e74b
parent b8501bdeb0b7e39a0d82f2a96ad382c05a763b22
author Brian Carlstrom <bdc@google.com> 1403144197 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403144197 +0000

am b8501bde: Merge "Switch from core to core-libart"

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