tree a81bc1cbbd3a0ea88f3d475fe52a911a82a5e5cf
parent 525df29ccb85525c143d0929d457ec34cd612e96
parent 9f33a5a7d9641ad905bc87c1a6fff85b15062e11
author Paul Hu <paulhu@google.com> 1586332012 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586332012 +0000

Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9

Change-Id: I89d306a86ae993b0fdc26c701624d5c6735f0df7