tree 10c5dc2691765d24df04c808019f176413253b8e
parent 943af28f37fed83f9f2b8253bde080d8ce4a73ae
parent 638282c8c8cd75a1490fba890db88a07e576581b
author Steven Moreland <smoreland@google.com> 1544833723 -0800
committer android-build-merger <android-build-merger@google.com> 1544833723 -0800

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

Change-Id: Icc0cd55325130cfb669beae446fa59462e9a49b5