OSDN Git Service

Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
authorZhi An Ng <zhin@google.com>
Tue, 17 Oct 2017 20:16:02 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Oct 2017 20:16:02 +0000 (20:16 +0000)
commit63e3339ec92cb5e61f0139edab012340896af595
tree4a8d5b8840a2a7fa8fd54d709fdc3d9b57953771
parent3b01d0a09a6bfdb9dd5dcea13989c43a0be3031c
parentd3dc9171d4ed4c38d63fbe02e7522e89dc55a68f
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
am: d3dc9171d4

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