tree 8ec367d53cd72ba1d52fa1c0163238dca9f2b6a0
parent c1ee5ff99bcd41d3b6768f937986772da2240a56
parent 4918e711d376f4cef30be735dfdb6b312e8b61fc
author Hai Zhang <zhanghai@google.com> 1563904623 -0700
committer android-build-merger <android-build-merger@google.com> 1563904623 -0700

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

Change-Id: I1c8b4ca10fcd2b8ae1c9327d86500cef308d8a59