tree 8e56b9e6b25a1e133cee5f51ed28ac27f9b0f698
parent f4245eb38af71862a5bc48e60cdc69b5c171b1e4
parent 3769b770231827b5b13f67e839a88f1db2fe0f97
author Steven Moreland <smoreland@google.com> 1590697568 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590697568 +0000

Merge changes from topic "parcel-allocation" am: 3769b77023

Change-Id: I12622f707bd9ce55617b479ff67d398a888c01c0