Adrian Roos 866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev ...

* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API

2014-11-20 21:41:41 +00:00

..

java

am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev

2014-11-20 21:41:41 +00:00

jni

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

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

res

am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev

2014-11-20 19:21:06 +00:00

tests

Fix wifi reconnection tests.

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