tree 0737c528e7ae4aa8bf6bb303545e57fdbee75608
parent 7f46327c04a5e36fde4a2143f3c7269ba1bc873a
parent d11b60855ca3c66a8b1e26eff583f76c8ed69ec5
author Tony Wickham <twickham@google.com> 1528482758 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528482758 +0000

Merge changes from topic "am-a4912ede-7663-4592-a9fd-02d7d5e05de7" into ub-launcher3-master

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