OSDN Git Service

Merge "Let the foreground service channel be blocked" into oc-dr1-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 17 Aug 2017 23:13:29 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 23:13:29 +0000 (23:13 +0000)
am: 6614a2e5d0

Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6

1  2 
core/res/res/values/strings.xml

Simple merge