tree 0a35ba09c7af51029b291aef16e1dee6dfc19708
parent ed85c9492b33a553e6d454bb75fbc30b3a97e26b
parent 00443e7b9b72b3b74bc2e2ed5a8fdadcc1c05b5c
author TreeHugger Robot <treehugger-gerrit@google.com> 1502902813 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502902813 +0000

Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into nyc-dev

* changes:
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22 am: 4fe58458a5 am: 841ed7f223 am: 0889f3a9e9 skipped: 62c8e2c8e8
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22 am: 4fe58458a5 am: 841ed7f223 am: 0889f3a9e9
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22 am: 4fe58458a5 am: 841ed7f223
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22 am: 4fe58458a5
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0
  DO NOT MERGE Disable overlays while installer is resumed