From: Jack Yu <jackyu@google.com>
Date: Fri, 23 Aug 2019 10:07:05 +0000 (-0700)
Subject: Merge changes from topic "null_callback" am: 5ce391b313
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e0afc80afb3d632551b8c5e5515b5239091581bf;p=android-x86%2Fframeworks-base.git

Merge changes from topic "null_callback" am: 5ce391b313
am: 54e83aca93

Change-Id: Ib8ddbf5f5e6b1b22bd7e6e6ee311153f332a5320
---

e0afc80afb3d632551b8c5e5515b5239091581bf