tree 3f6808d56185621753eb0a79cdfe286b1df588ba
parent d9e57599d11f07e7c094c57e97b4d5fb8ee75e92
parent f53ce454f41bbe279fda014e2cf007450f655dc8
author Selim Cinek <cinek@google.com> 1499359150 +0000
committer android-build-merger <android-build-merger@google.com> 1499359150 +0000

Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am: 7b04275a68
am: f53ce454f4

Change-Id: I1018d51c400de084cff8c4de7c633488c9f6070f