Michael Wachenschwanz 35f0b54149 Merge "Add GET_RESTRICTION_ENTRIES Broadcast to protected list"

2017-10-11 18:42:16 +00:00

..

java

Merge "Expose API for heavy-weight apps and get it working again."

2017-10-11 18:36:06 +00:00

jni

Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314 am: 6f42d696df

2017-10-11 16:28:26 +00:00

proto/android

incidentd: Dumping batterystats system data to proto.

2017-10-09 14:29:40 -07:00

res

Merge "Add GET_RESTRICTION_ENTRIES Broadcast to protected list"

2017-10-11 18:42:16 +00:00

tests

Merge "Attribute UNKNOWN display state to OFF"

2017-10-11 17:36:03 +00:00