tree 16ca0b237a6b82ec28394170f4746f814c6cd7fc
parent 35432c13751f0eee98ffb4c35b7b707216c47318
parent 61aec97dc9645a70e2f17d4cfb38a7ba3e3e548b
author Lorenzo Colitti <lorenzo@google.com> 1615457382 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615457382 +0000

Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f am: a035f85997 am: 61aec97dc9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e50ac962959387ec42ee644376e1c10df0dc677