tree 12aa0891d546897bd6ed307a179b137dceafd958
parent 5fb8a1d525962b68b3e5fb348ae1da293837a7f2
parent 0e6d2b5f4fb59054fe711014913c3373cb279baa
author Chenbo Feng <fengc@google.com> 1557771631 -0700
committer android-build-merger <android-build-merger@google.com> 1557771631 -0700

Merge "Clean up the permission control code in framework"
am: 0e6d2b5f4f

Change-Id: Iff2316f72df4cff56829b281882dc920d63937bd