Jeff Brown 9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev ...

Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b

2014-11-21 21:35:08 +00:00

..

java

resolved conflicts for merge of 694c1d2b to lmp-mr1-dev

2014-11-21 21:35:08 +00:00

jni

Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev

2014-11-19 23:55:52 +00:00

res

Merge "Make default windows features configurable." into lmp-mr1-dev

2014-11-21 19:18:50 +00:00

tests

Fix wifi reconnection tests.

2014-11-20 12:32:58 -08:00