tree 6cdd2ee196bd9ff00f76b2235d20fc7f58b178bf
parent 72e15a43c38f435dad4e73b627c2b0b490fecc97
parent 9820de4a404e28875141f1640dd975ec97a3a758
author Alistair Strachan <astrachan@google.com> 1531526105 -0700
committer android-build-merger <android-build-merger@google.com> 1531526105 -0700

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

Change-Id: I15d1246cffa46d5b232cccd63e416ac038322c5a