tree a6433659518e98fc78ba26578042e4aa456f4469
parent 75b3d8c07b3a658be574584f7004fe4468916b5b
parent 87c7a0d74b9dadaedfe6805c57d221d9c445aaf6
author Badhri Jagan Sridharan <badhri@google.com> 1404951375 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404951375 +0000

am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit '87c7a0d74b9dadaedfe6805c57d221d9c445aaf6':
  adbd: adb root should terminate adbd only if it's debuggable