OSDN Git Service

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

Change-Id: I65fd9c378937f9ce634a679e6779368aa63fc143


Trivial merge