Mathew Inwood 5e99817407 Merge "Add <p> to UnsupportedAppUsage javadoc." ...

am: dfd7bc77c3

Change-Id: I7e9c71304d072d0883b004760d489637a1ff4b96

2018-08-28 08:54:05 -07:00

..

java

Merge "Add <p> to UnsupportedAppUsage javadoc."

2018-08-28 08:54:05 -07:00

jni

Add system_server to system group only if per_app_memcg is true

2018-08-28 01:45:11 +00:00

proto

WM: Add debug information for forced seamless rotation

2018-07-09 14:24:19 -07:00

res

Merge "Separated emergency option final UI"

2018-08-16 16:43:04 -07:00

tests

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 10:43:49 +00:00