tree b9a70630c9a6f6b1c85df7f73a651d06877ca360
parent 4b862652180616a5abeb8b915ba6339b64aec1c4
parent b32f14c2e9ee051f2f0055a1a6ca92648b883ceb
author Adrian Roos <roosa@google.com> 1503510555 +0000
committer android-build-merger <android-build-merger@google.com> 1503510555 +0000

Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev am: 07168bf44b
am: b32f14c2e9

Change-Id: I98f8eb4bd3a81e1d48b82c925dbf5cf5ac562de4