tree a7a6aa90a3a9b133dbc92f5113269711f848e15d
parent 28c413eb32db771318bbe52139381c9a62ddfa33
parent e747c3e4e18d7110db6e5ca95404c786c0f57482
author Evan Rosky <erosky@google.com> 1541639727 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541639727 +0000

Merge changes from topic "wm_move_disp_to_hier_2"

* changes:
  Move some display logic into hierarchy [2/2]
  Move some display logic into hierarchy [1/2]