tree 2b49a9f6c821b62ea90b15f900a03b6edd5d8b92
parent ee052afb4f928519831fbcfb61d60df8a21d5df7
parent 403f00bfb802fc3b196ac307e81ee19fbdf5306d
author Treehugger Robot <treehugger-gerrit@google.com> 1601595595 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601595595 +0000

Merge "Parcel interface token methods @NonNull." am: 403f00bfb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444678

Change-Id: Ica39b914561ef61fb15ba06de9451a08c9102d4c