tree 69d415d7b30d5191f1e4ac6f50e2ded5097c07ca
parent ac978e48eb8c067e1626960fd4df60236e5bf841
parent 45407b471ef831fc10e79fc1f9ea5a6c8d838387
author Nick Kralevich <nnk@google.com> 1450902522 -0800
committer android-build-merger <android-build-merger@google.com> 1450902522 -0800

Merge "set ro.adb.secure=1 for user builds" am: f9911ae087
am: 45407b471e

* commit '45407b471ef831fc10e79fc1f9ea5a6c8d838387':
  set ro.adb.secure=1 for user builds