tree b5ff277ce80a60c8f8003ebc00f66a7e40e981bf
parent 3da7190bae7c1d75edbc87f01343652c246639f2
parent 11a66e40891234c4e54fb4c4e37f45f1651af770
author Andreas Gampe <agampe@google.com> 1476803756 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476803756 +0000

Merge changes I7061c450,Ie8f8f24b,Ia6cee2cb

* changes:
  ART: Do not free allocation listener in heap destructor
  ART: Fix allocation entrypoint instrumentation
  ART: Fix lock order issue in allocation tracking