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

automerge: 6a110c1

* commit '6a110c1adfcb4e996d1e1ac187dbbceb3113b879':
  Setting ADB_ENABLED may result in a SecurityException.
This commit is contained in:
Geoffrey Borggaard
2014-11-21 02:59:52 +00:00
committed by android-build-merger

Diff Content Not Available