tree c4274c50c24ac4796be46c6761d63c176dc2f44c
parent 30890f2853dc7d2871d4485e2af3467bb7960b88
parent dd8b58457c6ce18ec98f1b2419300aa8c9cd326d
author Scott Main <smain@google.com> 1360778741 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360778741 -0800

am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev

# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dd8b58457c6ce18ec98f1b2419300aa8c9cd326d':
  docs: add info about secure adb