OSDN Git Service

Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev
authorFan Zhang <zhfan@google.com>
Fri, 23 Sep 2016 23:37:49 +0000 (23:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 23:37:49 +0000 (23:37 +0000)
am: c5bfd5f5a8

Change-Id: Ie0736338105b670e827b636091ef3235ef872489


Trivial merge