OSDN Git Service

resolve merge conflicts of 0073a03 to nyc-mr1-dev-plus-aosp
authorAlan Viverette <alanv@google.com>
Fri, 17 Jun 2016 21:35:07 +0000 (21:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:35:07 +0000 (21:35 +0000)
commitcf6d621e7d27497fd426882c705ade58020b04cc
tree502422cfe956668496e821be0058b2b2ee11367d
parentc52d31fa4ebeb0c9a8bbd33ea0a0eb26b6087daa
parentaa02b97667f593baf668f81b64395e3816c03c9c
resolve merge conflicts of 0073a03 to nyc-mr1-dev-plus-aosp
am: aa02b97667

Change-Id: I640c1012d31bd226941e7294867f2200860b4b0e
core/res/res/values/strings.xml
services/core/java/com/android/server/am/ActivityManagerService.java