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)
commit237eb8843409eb6b0b64f855fd90c969f8ad95bb
tree4e685e03dda801d0916c487981bd2c57498c0a96
parent8485562ded67d84e25cbc549f381e988e6bfe412
parent6393e1752fff25a80ca5df7856071ccc5276a714
Merge "Notification settings, importance and pre-O apps" into oc-dev
am: 6393e1752f

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad