tree 747ce10f8982794429e169a2db39563c50ddae00
parent a0fcc72ca213a9a34daf584b73adaecf72b890a9
parent 7afb6a13996765902a547b974a45d8afa21cb3aa
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606785439 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606785439 +0000

Merge "Merge "Update link for Permissions samples in Javadoc" am: a7564ec175" into stage-aosp-master am: 9f4e8b8830 am: 7afb6a1399

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

Change-Id: I8fccf255f3645c670581235c734ae11df997cb92