OSDN Git Service

Merge "Prevent crashes when user is stopping" into oc-dev
authorFyodor Kupolov <fkupolov@google.com>
Sat, 6 May 2017 02:04:01 +0000 (02:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 6 May 2017 02:04:01 +0000 (02:04 +0000)
am: b4656dafc1

Change-Id: Ic350bed31bd9d92f377bbe88aa5d8142984ec5f9


Trivial merge