tree 8133cdd5a77f55fc6f1252122546d7c872273baa
parent 3fc9dbd826c8aaabec64fc55739f98194bdf8a09
parent a028215e7f5c3c497bc880ce6d72c80d11d5b5bc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586417666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586417666 +0000

Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours" into rvc-d1-dev-plus-aosp am: a028215e7f -s ours

am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history

Change-Id: If5fcedd4405a6ce59c74b6d42fe6d089c3c62810