commit | 2cc7df40837cbe73beba6d881599d0ddc17248f2 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Tue Jun 09 20:31:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 20:31:38 2020 +0000 |
tree | cd166d28a6fc533d1a908a792b1a3d3683b5e787 | |
parent | 3e9dc9bb649efd41cdcd40eba1153ce23b745c17 [diff] | |
parent | 43602d3a349bd45c9afea7775cd7c1ad4e54b0aa [diff] |
Merge "adbd: remove ifdefs guarding root/secure." am: 43602d3a34 am: 3ea63f1637 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1324037 Change-Id: Ie1d6eb5c7a1aea093ec3a3a816ec9c613f2e93c5