Adrian Roos 666dbb43b9 am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev ...

* commit 'b00540dc5c2d475fd6a6833f1a805cb0a683e264':
  Clarify javadoc of isKeyguardSecure and isDeviceSecure

2015-04-29 22:22:17 +00:00

..

java

am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev

2015-04-29 22:22:17 +00:00

jni

am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev

2015-04-29 19:55:31 +00:00

res

am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev

2015-04-29 20:40:12 +00:00

tests

am a4edc82e: am 4547dac0: Fix one-off error in reporting.

2015-04-28 21:09:13 +00:00