OSDN Git Service

Merge "Changed alert window notifications to use single channel" into oc-dev
authorWale Ogunwale <ogunwale@google.com>
Mon, 15 May 2017 22:34:59 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 May 2017 22:34:59 +0000 (22:34 +0000)
commit33c831a15ce7de5220a6b60c6232169fa02a01b1
tree3dad46b956ccab51d5bedd9ca9d68ac8f8578945
parent41b5c9441d89d495503c7de0bdf77580dda0d44e
parent648e127fcb8bdccdd684d5167b785f22ef65f2ae
Merge "Changed alert window notifications to use single channel" into oc-dev
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e