OSDN Git Service

Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
authorJason Monk <jmonk@google.com>
Mon, 27 Jun 2016 18:46:31 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Jun 2016 18:46:31 +0000 (18:46 +0000)
am: 77fc052dd7

Change-Id: If6470542c1fbf62dcacfef2cb6d858c18e18cfc6


Trivial merge