tree 7b5cd3b11ebd205e404d4fe3d1a74729851785c8
parent 7901658787e1b7d645f81b24babd1e774482d48d
parent e8b0fcecf4a17cf37b5fefbcceef0920788f776e
author Tom Cherry <tomcherry@google.com> 1441389385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441389385 +0000

am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"

* commit 'e8b0fcecf4a17cf37b5fefbcceef0920788f776e':
  combine adbd.rc with init.usb.rc