tree 32a31fc051de59f4951c233471061d276bb3b244
parent 719bd483aa21e0ad9bbfd7fb39cd7eee1c59643c
parent 25a9ba1bc75c504daa433d0eb134c7b8f786c059
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582774555 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582774555 +0000

Merge "Use std::optional for @nullable (AIDL)" am: b08a7a4997 am: 25a9ba1bc7

Change-Id: I83e0f56361908eba30a687cab8c4bddef9831787