tree 3d11d536d6d242c7708f8492c57acff2db103bf4
parent a77a076bb3e27406860614f8715b54d9e0e49148
parent f426b2b0bbdf7516c568720ce27f152afab80b73
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1583344061 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1583344061 +0000

Merge "[automerger skipped] Merge "libincfs and libdataloader headers not using std::span" into rvc-dev am: 2c3f5d24ce am: 46bd980157 am: b959c73570 -s ours am skip reason: change_id I76715d6ea39da05fa82cec0e680a1896f5a88fe9 with SHA1 9b75308974 is in history" into rvc-qpr-dev-plus-aosp