From: Dan Willemsen <dwillemsen@google.com>
Date: Sat, 20 Apr 2019 02:17:46 +0000 (-0700)
Subject: Merge changes from topic "R"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f305a992162f03d9c6055eeaa5421a0e67badbc;p=android-x86%2Fframeworks-base.git

Merge changes from topic "R"
am: 39a77f1951

Change-Id: I32a27fb346e236a6836d4c139cac2fb4cfdb733d
---

4f305a992162f03d9c6055eeaa5421a0e67badbc