tree 41707ce5ffa524046f313ed5cb9d48ddd72f8705
parent 1e21911c81940b4a1eae65eb265deb5bfe749c7c
parent 8000286ede045ea99ae9efe2b1e8fdad1c0a605d
author Treehugger Robot <treehugger-gerrit@google.com> 1618995230 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618995230 +0000

Merge "Add the related extra information in the javadoc" am: aaf353b24c am: 8000286ede

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

Change-Id: Ia2c8d547ec240b828925a98bf2e43291ababebca