tree 6cdd2ee196bd9ff00f76b2235d20fc7f58b178bf
parent e5371e40703435294a9309f141e7a4defce60f7a
parent 4d323b37ea55124dc03832aed4146abedae7e62d
author Alistair Strachan <astrachan@google.com> 1531526826 -0700
committer android-build-merger <android-build-merger@google.com> 1531526826 -0700

Merge changes from topic "gralloc-drm_hwc-prep" am: 9820de4a40
am: 4d323b37ea

Change-Id: Ib8431b604a5a12f7bd2ab6c434ab198da0df9416