tree c6167b4773365b0837ec329ff6ee0b13170a47a4
parent a6ff492941fd52bd00e55f09c0d580fe709e7fd3
parent 1cfc324de1fe4e9a0559eef846b6ee9015ce7f59
author Narayan Kamath <narayan@google.com> 1501156356 +0000
committer android-build-merger <android-build-merger@google.com> 1501156356 +0000

Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d am: 19d39ee384
am: 1cfc324de1

Change-Id: I884488795303effda4274978c93e086cee433272