tree 864b094489e8d2ab165dd1aa8f5fb3eba9626adf
parent 04520a01b8469729379e73a7995a188ffea2b187
parent 4b07b26e8654df52ca80bb2165ebdf9352ab9337
author Adam Lesinski <adamlesinski@google.com> 1392838886 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392838886 +0000

am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev

* commit '4b07b26e8654df52ca80bb2165ebdf9352ab9337':
  Make UsbService optional