OSDN Git Service

Merge "Turn down the preliminary foreground service API" into oc-dev
authorChristopher Tate <ctate@google.com>
Tue, 18 Apr 2017 01:58:32 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 01:58:32 +0000 (01:58 +0000)
commit663de998e72255e60a6021e2ceb1c46afd3b17d3
treeac39e9085b36ec859c6139170b92dd48c44f7d42
parentdd9f14c5cd0fcfad9cad4f06659c41806b9edc6c
parent00ed0baca874e171ecb39e51edfe0ee6eb6646f2
Merge "Turn down the preliminary foreground service API" into oc-dev
am: 00ed0baca8

Change-Id: I50fba7a59e4f52500f4708e194864dc9dece8c71
api/current.txt
api/system-current.txt
api/test-current.txt
services/core/java/com/android/server/am/ActivityManagerService.java