Narayan Kamath ecd072161e resolved conflicts for merge of 22d07464 to master ...

Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d

2014-03-27 14:22:47 +00:00

..

src/com/android/future/usb

…

tests/AccessoryChat

…

Android.mk

…