Jeff Brown 1ac13e0212 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev ...

* commit '682ed6b60807d5fa971dbd6c76deae788cb65df4':
  Support keeping activities resumed while dozing.

2014-11-21 21:53:10 +00:00

..

java

am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev

2014-11-21 21:53:10 +00:00

jni

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

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

res

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

2014-11-21 19:21:25 +00:00

tests

Fix wifi reconnection tests.

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