tree e984586b1d75c6894e4988ef6c6bb4d9d5e6af79
parent 74ddd19d88cb9c9d9994661575cf5a043aa934d7
parent 4918e711d376f4cef30be735dfdb6b312e8b61fc
author Hai Zhang <zhanghai@google.com> 1563904556 -0700
committer android-build-merger <android-build-merger@google.com> 1563904556 -0700

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

Change-Id: I28a53f02f8cfc41c8ce6e23976f7efd4fdb3fa90