Dan Albert 8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp ...

Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c

2014-09-19 16:13:49 -07:00

..

src/com/android/future/usb

…

tests

…

Android.mk

…