tree 7a249a0a9b30d81be17af530c49dc521b0257b1a
parent 6b42b276199984e04757cf20500b6e82f4d87700
parent edd4f89f4d11955d2a5109138b4b5ee19f83e053
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527877494 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527877494 +0000

[automerger] Skip shelf adjustment for PIP when quickscrubbing am: edd4f89f4d

Change-Id: I3ae41c47d1472dc9e3c63814223a186e06313ec7