am 235fcdce: am 271ddfce: Merge "Setting ADB_ENABLED may result in a...
am 235fcdce: am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cff automerge: db1e7fa0 automerge: 6a110c1a
* commit '235fcdce':
Setting ADB_ENABLED may result in a SecurityException.