OSDN Git Service

Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
authorSalvador Martinez <dehboxturtle@google.com>
Fri, 27 Jan 2017 20:03:12 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 20:03:12 +0000 (20:03 +0000)
am: 4edcb927ab

Change-Id: I384020dab83593e815c0afc0d5c2657c9dcaacbc


Trivial merge