tree c124158639b9a54b387e82ed1fad990b4b92c78d
parent d9d20baf6f188d47f509e3ad3850fe526d750aec
parent 9fa61b4df3443e5c0a5e393af85e8e59b686fa14
author TreeHugger Robot <treehugger-gerrit@google.com> 1504229451 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1504229451 +0000

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