OSDN Git Service

Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
authorSelim Cinek <cinek@google.com>
Thu, 6 Jul 2017 16:13:39 +0000 (16:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:13:39 +0000 (16:13 +0000)
am: 7b04275a68

Change-Id: I2997be04f1b6b518bc11dd291e2ae1fba55453ea


Trivial merge