Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 am: 90b5c42444 am: 015701148d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313 Change-Id: Ifce3b64be99e618e67ad2f86fb6eabf036700770 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: