tree cdc9ed7b6b869dd952734e8499c6210e1365f12b
parent 9756df8e85887f08a20ecc9444fbbcfa0285fd2f
parent 60e97a4bd482a0b096135099e3ac179d8676ede0
author Mathieu Chartier <mathieuc@google.com> 1473228786 +0000
committer android-build-merger <android-build-merger@google.com> 1473228786 +0000

Merge "Revert "Don't use profiles with vm safe mode""
am: 60e97a4bd4

Change-Id: Ia1a6395ae26733028d1c3487332400c3000de2bb