Nathan Harold 2ecdcb6f21 Revert a bad merge from ag/6938423 ...

Bug: 130174575
Test: none
Change-Id: I7684f9e06f4d226010448e5520965a8733c43073
Merged-In: I7684f9e06f4d226010448e5520965a8733c43073
(cherry picked from commit 12f75864a2)

2019-04-08 21:07:23 +00:00

..

android

Revert a bad merge from ag/6938423

2019-04-08 21:07:23 +00:00

com/android

Merge "Restricted permission mechanism - framework" into qt-dev

2019-04-08 08:18:59 -07:00