Kweku Adams 671ae9b825 Merge "Marking ClipData as LOCAL and adding comment in jobscheduler proto." into pi-dev ...

am: 788e74a613

Change-Id: Ib03f55dd91feb08b9f6f91238d8ea8cbaabcbd2d

2018-03-28 00:17:59 +00:00

..

java

Merge "Work on issue #74404949: Screen state usage API" into pi-dev

2018-03-27 23:37:02 +00:00

jni

Merge "Use ABI_STRING." am: ca7ce49ecc

2018-03-23 21:28:16 +00:00

proto

Merge "Marking ClipData as LOCAL and adding comment in jobscheduler proto." into pi-dev

2018-03-27 23:17:31 +00:00

res

Merge "Migrate from config.xml to SystemConfig for disabled carrier apps" into pi-dev

2018-03-27 22:48:15 +00:00

tests

Merge "Add auto battery saver suggestion notification/dialog" into pi-dev

2018-03-27 22:19:01 +00:00