tree 4aade2256ee9ac743c4d0ab5f82c837586c2d2c2
parent a48273b4cb9f8cad0bbd347c523ed10031b2ae4c
parent 7f300e3dfff8712483991ec81696f324e2f2b61e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528421258 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528421258 +0000

[automerger] Track shelf rather than app window am: 7f300e3dff

Change-Id: I46442796f81ecb185bf74f2b1a873e08f679a8d1