OSDN Git Service

Merge "Update override config to include some changes from global config" into nyc-dev
authorAndrii Kulian <akulian@google.com>
Wed, 1 Jun 2016 01:20:39 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 01:20:39 +0000 (01:20 +0000)
commita0668c7442ed2f66323c4ae798b5b39c1ab7cd52
tree537617d2ba3764c8060b1db49f177ab05f6df5d4
parentbf3d1fc24527d521c2538e4266dcb48a17bca422
parent88be465ce572f84649e01744a7ec96b6346b3686
Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I0f1f9f64bcd81321f44c48cd01537749ac4727ea
services/core/java/com/android/server/am/TaskRecord.java