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

am: 886fc6aef0

Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd

2018-04-02 17:52:06 -07:00

..

java

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

2018-04-02 17:52:06 -07:00

jni

Merge "Fix regression to drawBitmapArray" into pi-dev

2018-03-31 02:46:22 +00:00

proto

Merge "Enable Last Kmsg, also fix the GZipSection test." into pi-dev

2018-03-30 14:54:55 +00:00

res

Merge "Add config flag to specify if wallpaper is rendered" into pi-dev

2018-04-02 19:20:24 +00:00

tests

Merge "Don't finish activity on duplicate resume request" into pi-dev

2018-04-02 22:58:26 +00:00