tree b7054c38b2524732a4d74a6b2cea7d765c973fc9
parent 1341917cf63444e6b9c721df7ebe79f5b8ca3826
parent c23b16a97a74a0bf31f975ab9437134ba9f15c1b
author Steven Moreland <smoreland@google.com> 1544834419 -0800
committer android-build-merger <android-build-merger@google.com> 1544834419 -0800

Merge changes from topic "ndk-aidl-parcelable-array" am: d38a30a6f9 am: 638282c8c8
am: c23b16a97a

Change-Id: I2b4861efc14064aebd35cda6707f2585598a9541