OSDN Git Service

Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
authorAdrian Roos <roosa@google.com>
Wed, 23 Aug 2017 17:26:03 +0000 (17:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Aug 2017 17:26:03 +0000 (17:26 +0000)
am: 07168bf44b

Change-Id: Iaaf4c696269279b5ad3c2489a636450ead02f475


Trivial merge