tree fb12c902138d18607b4ec4de0a605c6252b7fc61
parent 6085e49a5a5bbaf359c03afeaf76b1267a635e4f
parent bd745f763aae2e6f49343391349da7fc4bdeded0
author TreeHugger Robot <treehugger-gerrit@google.com> 1586278230 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586278230 +0000

Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a

Change-Id: Ie0fb340288decd887a9e47f7626c43c0ad2290e2