Merge "Revert "adbd: lessen security constraints when the device is unlocked"" into oc-mr1-dev

am: 7e929121b1  -s ours

Change-Id: Ia325c7b24a09a6f117e5d26da8d75d341e4fd94a
This commit is contained in:
Bowgo Tsai 2017-09-01 01:37:40 +00:00 committed by android-build-merger
commit 2743cf88e8

Diff Content Not Available