tree 213ab8530fad80a366e07997f7bea657a9c5c9d4
parent 63a345cd154c852cc4375030088b91a5560149f0
parent 0444e7f62e42a21af628f7ecb8edd451bba1e6a3
author Hai Zhang <zhanghai@google.com> 1563905987 -0700
committer android-build-merger <android-build-merger@google.com> 1563905987 -0700

Merge "Fix permission javadoc about whitelisting." into qt-dev am: 4918e711d3 am: e524e8e22d
am: 0444e7f62e

Change-Id: Icc263b71fda34e97097d151f37c15be7b031c79a