Dianne Hackborn a54a0df596 Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev am: c3b938ca5e ...

am: 8b4c4f09f6

Change-Id: Ia6dd41e08ea31ccc902c4d9ba714e6448898fac4

2017-05-11 19:34:30 +00:00

..

java

Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev am: c3b938ca5e

2017-05-11 19:34:30 +00:00

jni

Merge "WTF Logging for catching memory issue in Parcel" into oc-dev am: 9254322192

2017-05-11 06:59:10 +00:00

proto/android

Add persistent state for Bluetooth high quality audio support

2017-05-03 04:36:51 +00:00

res

Merge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am: b569eedf37" into oc-dev-plus-aosp

2017-05-11 06:18:28 +00:00

tests

Prepare for removal of junit and android.test classes from Android API (step 1)

2017-05-10 09:42:29 +01:00