tree 6bb60936b5762981e5a07938f13bc08271b44327
parent c93e4cde2472782ae6a30c5fa95d543403101b01
parent b0aeeb777f6c2567a9ea038c9442c1df592b7e04
author Andreas Gampe <agampe@google.com> 1439846804 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439846804 +0000

am b0aeeb77: Merge "ART: Follow-up fixes"

* commit 'b0aeeb777f6c2567a9ea038c9442c1df592b7e04':
  ART: Follow-up fixes