tree 7b7ff1b0aa204c3ddcd215591451c09209646b47
parent c322ec3fcf5a1d993807802ace6f608467d8c358
parent f03be92220a9846f7609b8ac9c4fb16c0f4cc304
author Louis Chang <louischang@google.com> 1542131995 -0800
committer android-build-merger <android-build-merger@google.com> 1542131995 -0800

[automerger skipped] Merge "Reduce screen layout in task override configuration from its parent config" am: 6e12301e84 am: e5424ec55b
am: f03be92220  -s ours

Change-Id: If60048af2d5f6929b64d04d59086860d90b77d18