tree 00ac3c49c3f40782e7cee6bf6d3724d4ec3d64af
parent 274f0bb881d4dacf9f5aea1c93165fe03408fbdc
parent 3cfac28462910d3f976aebac54ac7301aca7e434
author Steven Thomas <steventhomas@google.com> 1487038459 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487038460 +0000

Merge "Ignore callbacks from the non-active hardware composer"