Neil Fuller 8b14d33acb Merge "Make Half class use public APIs" am: 7e957e57b7 ...

am: 04c66489bc

Change-Id: I35fa0a22465885a47612601d541afb366b5953ec

2018-07-03 13:17:31 -07:00

..

java

Merge "Make Half class use public APIs" am: 7e957e57b7

2018-07-03 13:17:31 -07:00

jni

Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev

2018-07-03 12:05:38 -07:00

proto

Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev

2018-05-26 02:23:25 +00:00

res

Merge "Cross fade wake-up from pulsing" into pi-dev

2018-07-03 12:20:31 -07:00

tests

Merge "Disable hidden API checks on unit tests"

2018-06-29 02:15:47 +00:00