Bryce Lee fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev ...

Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960

2014-10-22 16:56:08 -07:00

..

java

resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

2014-10-22 16:56:08 -07:00

jni

Merge "Decoder only returns true on complete success." into lmp-mr1-dev

2014-10-22 21:53:07 +00:00

res

resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

2014-10-22 16:56:08 -07:00

tests

Add CHANGE_NETWORK_STATE permission to bt tests

2014-10-15 14:06:30 -07:00