tree e8978758c0982889619d75d07fec31c57a34d535
parent c57e34a9081e5e89379f0ef916a4d41347091a9e
parent f47e5ce3cf7e3eb4d481aea765784a8c6c19f47e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1525202504 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1525202504 +0000

[automerger] Gracefully handle some edge cases in quick scrub am: f47e5ce3cf

Change-Id: I969b2cae6b73cbc0aaf29399aac6f1fc1b16f7f8