vandwalle 2bc9f4178a Merge "make autojoin associated scan period a config opttion" into lmp-dev

2014-09-09 22:12:06 +00:00

..

java

Merge "User restriction to disallow outgoing NFC beam" into lmp-dev

2014-09-09 20:29:57 +00:00

jni

Merge "Trim unnecessary pages when printing." into lmp-dev

2014-09-09 22:11:20 +00:00

res

Merge "make autojoin associated scan period a config opttion" into lmp-dev

2014-09-09 22:12:06 +00:00

tests

add some assert messages to download manager test

2014-09-09 14:44:17 -07:00