tree 00c11d965ddc8a5bccc37b623c48862eaf2ee25c
parent 327772948102aefc97285bfb057c891327718e76
parent 9b45364bbd7bf867812e5a2c35085c82d12991a1
author Jack Yu <jackyu@google.com> 1508542288 +0000
committer android-build-merger <android-build-merger@google.com> 1508542288 +0000

Merge "Make notification not swipeable"
am: 9b45364bbd

Change-Id: I50462448e0e8071c29b4ba026e211f88e947c719