OSDN Git Service

Merge "Notification settings, importance and pre-O apps" into oc-dev
authorJulia Reynolds <juliacr@google.com>
Fri, 12 May 2017 12:20:36 +0000 (12:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 12:20:36 +0000 (12:20 +0000)
am: 6393e1752f

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad


Trivial merge