tree 078ea7f7d71952df9ca08f29c78ec2568f8875e1
parent 4ab43739e556aab0e689005222f99d9b34e738d5
parent 9ca8544e733afedee9737c8696028fcaa98916fe
author Sean Paul <seanpaul@chromium.org> 1495119055 +0000
committer android-build-merger <android-build-merger@google.com> 1495119055 +0000

drm_hwcomposer: Add Marissa and remove Haixia am: d35880b46f am: 578059aa61 am: 3d139a7676
am: 9ca8544e73

Change-Id: Iac245c606378923f2f8e9f9fa65f6951af39ec97