Alan Viverette c65c7ae635 Merge commit '6682183b' into manualmerge ...

Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33

2014-06-01 16:44:28 -07:00

..

java

Merge commit '6682183b' into manualmerge

2014-06-01 16:44:28 -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

Merge commit '6682183b' into manualmerge

2014-06-01 16:44:28 -07: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