tree 5460c13747e3ba1055d08e2a689bf9cdb706631c
parent dc49340eedd256e5c4def71fa9a450688f5133fa
parent 72790bade5f6f2c3673145f39c1e416666f7f579
author Andrii Kulian <akulian@google.com> 1491616857 +0000
committer android-build-merger <android-build-merger@google.com> 1491616857 +0000

Merge "Use feature instead of hidden config for multi-display" into oc-dev
am: 72790bade5

Change-Id: I557c1b47e960ff2b7715dc71827ac200a21952db