OSDN Git Service

Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev
authorGeoffrey Pitsch <gpitsch@google.com>
Thu, 13 Apr 2017 20:10:13 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 20:10:13 +0000 (20:10 +0000)
am: c4ca1b5677

Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a


Trivial merge