tree 8f7c41e2dd2e9aeb1e4e9096a768132e24c9a136
parent 71ae73c01dd8ef12b69e25b5925cd85bc1bfd91d
parent b71c8a293a22d116796174b571afbaacccc3bc10
author Elliott Hughes <enh@google.com> 1433550921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433550921 +0000

am b71c8a29: am e1061914: Merge "Make start/stop warn if you\'re not root."

* commit 'b71c8a293a22d116796174b571afbaacccc3bc10':
  Make start/stop warn if you're not root.