From: John Reck <jreck@google.com>
Date: Wed, 24 May 2017 00:48:30 +0000 (+0000)
Subject: Merge "Fix null deref crash" into oc-dev
X-Git-Tag: android-x86-9.0-r1~3069^2~342
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f7f8bfddb;p=android-x86%2Fframeworks-base.git

Merge "Fix null deref crash" into oc-dev
am: c1affe14c2

Change-Id: Ib8e4c34fb38400dc748b463c5ab965d57e260fd0
---

1f7f8bfddb479ad35073e5e81d56a9c1308cf08e