OSDN Git Service

Merge "Add color mode setting" into oc-mr1-dev am: 19aa8ae955
authorChia-I Wu <olv@google.com>
Wed, 25 Oct 2017 04:54:24 +0000 (04:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 04:54:24 +0000 (04:54 +0000)
commit8b3152c37a73ee0fca6292f74954204366d73dfe
treec5d985327b46fb4ae4e88b4f3f7f53e3bf91d4a4
parent998d84a0d9ebf61f001232a2a3675bbaed7d0f50
parent51c2848c449a322afc3977f4918a84b40b0a734e
Merge "Add color mode setting" into oc-mr1-dev am: 19aa8ae955
am: 51c2848c44

Change-Id: I97fb37429e97c59b223a36431f59c43c86c92ab0
proto/src/metrics_constants.proto
services/core/java/com/android/server/wm/WindowManagerService.java