tree e4c52bb6152c42c956288b4a8e65ba02b645bc55
parent 6feaa267a585f22595f846c9e3d09a76dc3db47a
parent 2cb6c60c0d2de3bc743c043aca963db6fe52662f
author Adam Lesinski <adamlesinski@google.com> 1392838713 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1392838714 +0000

Merge "Make UsbService optional" into klp-modular-dev