Wei Wang 2fabda1906 am 283a2233: Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev ...

* commit '283a223371df58274fdc4380f9710511775eecc5':
  Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925.

2014-06-04 17:02:02 +00:00

..

assets

…

res

am 283a2233: Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev

2014-06-04 17:02:02 +00:00

Android.mk

…

AndroidManifest.xml

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…