Elliott Hughes f8abeb8457 resolved conflicts for merge of 04c987a8 to master ...

Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe

2014-05-30 20:13:15 -07:00

..

java

resolved conflicts for merge of 04c987a8 to master

2014-05-30 20:13:15 -07:00

jni

am f2e19a36: Merge "AudioManager: add audio port gain control" into lmp-preview-dev

2014-05-31 01:56:09 +00:00

res

am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev

2014-05-31 01:56:15 +00:00

tests

am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis

2014-05-30 21:38:59 +00:00