tree bcf508be5b857541dda9a2525ac50c48c97b2dd0
parent 888f883505006b546bc2d88b2b1812fa9a0f0713
parent 91476a0c2068e3a0b6bee8e496b768e78910ad2a
author Fred Fettinger <fettinge@motorola.com> 1466098169 +0000
committer android-build-merger <android-build-merger@google.com> 1466098169 +0000

Merge \"HWC2On1Adapter: populateCapabilities: fix virtual display query\" into nyc-mr1-dev
am: 91476a0c20

Change-Id: Ic1806500ba732a756ea1f95b0fc023b544c39ecc