Carmen Jackson e154c72e85 Merge "Added system_server to system group" into oc-mr1-dev ...

am: 22d055566a

Change-Id: I0b6deacd471b2a6c082cb2cc916e8ee577045c9e

2017-08-30 01:07:24 +00:00

..

java

Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev

2017-08-30 00:05:36 +00:00

jni

Merge "Added system_server to system group" into oc-mr1-dev

2017-08-30 01:07:24 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Add new system API for stable display size" into oc-mr1-dev

2017-08-25 21:02:36 +00:00

tests

Merge changes from topic "siyamed_maxlines" into oc-mr1-dev

2017-08-24 19:59:22 +00:00