am 235fcdce: am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa automerge: 6a110c1

* commit '235fcdceb439fe676f6876c6c74626718363c540':
  Setting ADB_ENABLED may result in a SecurityException.
This commit is contained in:
Geoffrey Borggaard
2014-11-21 12:18:05 +00:00
committed by Android Git Automerger

Diff Content Not Available