tree eaafa128316170f3189669337df33f7e8131f4b3
parent 0562ebc7a468225da40a366718e16251361d8f3b
parent e524e8e22ddbf9e11ee3ff23fd16fbb229c73a28
author Hai Zhang <zhanghai@google.com> 1563905131 -0700
committer android-build-merger <android-build-merger@google.com> 1563905131 -0700

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

Change-Id: I03c0f69b509bb7f1a8f17e8c2d18f2c3bbb9325e