OSDN Git Service

Merge "Fix potential access to invalid memory during shutdown" into oc-dr1-dev
authorDaniel Nicoara <dnicoara@google.com>
Fri, 30 Jun 2017 15:46:07 +0000 (15:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Jun 2017 15:46:07 +0000 (15:46 +0000)
am: 77e9eeba69

Change-Id: I5b5703ab3b70755d3f8b8e2674c7c32ce0e1c05b


Trivial merge