commit b8469ec2908f3cf6aa9cab5de8adbef05b2755e0
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 16 17:00:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 17:00:44 2017 +0000
tree b6b9ac699aeeec9f1cc672a3a62a41faea1b5f37
parent 4680e33b850e0a5604423c6305da9e48b83ec6fb
parent ce39f3bb963ad873083ad9ff42c0615dd5210dd1

Merge changes from topic "am-487b3a4e-6c35-49a5-a21b-805401f2196b" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 287d1d11a3 am: 12d9a36d97 am: aa8260c236 skipped: bad1f6cd62 am: d9e94ca20a
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 287d1d11a3 am: 12d9a36d97 am: aa8260c236 skipped: bad1f6cd62
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 287d1d11a3 am: 12d9a36d97 am: aa8260c236
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 287d1d11a3 am: 12d9a36d97
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 287d1d11a3
  DO NOT MERGE Disable overlays while installer is resumed