commit 05805a7b5f31771d7d1abbea1081428af1ae8286
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 16 17:00:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 17:00:30 2017 +0000
tree b907a4a1c991b715d6e7958ae9dea3c08b5d3c43
parent 8432bede0362cc6aaf13ef2035ee05cb1e9ceaf4
parent 30cc8b7901fbecc0b3a6bcca15392ab2dfd8bc65

Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8-lmp-mr1-dev" into cw-e-dev

* changes:
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: a7fe26f6f0 skipped: c2ea8976c2 am: abf602feb8 am: 974300a132
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: a7fe26f6f0 skipped: c2ea8976c2 am: abf602feb8
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: a7fe26f6f0 skipped: c2ea8976c2
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: a7fe26f6f0
  DO NOT MERGE Disable overlays while installer is resumed