tree eac18fab22af573616506bceec78517a3e11585f
parent d969d21482359d17a5fb86e325f31f675374ec79
parent e33a7cb5c3130f5137f37685e50bd912393fdf71
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582134548 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582134548 +0000

Merge "Update javadoc of deprecated UICC APIs" am: e73b46c9d9 am: e33a7cb5c3

Change-Id: I91dd2f7973670403c51210c07a6d12f14a63e4e0