tree d38b97776da30fe4ed0ab85e669d4eb0a8a87b65
parent a48273b4cb9f8cad0bbd347c523ed10031b2ae4c
parent 89126653cd38b6b461e893edbd3163d27a943c83
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528429801 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528429801 +0000

[automerger] Don't intercept above shelf progress if still animating am: 89126653cd

Change-Id: Ida5b5548edb8495e2b4cb15291dc6778cf80b746