Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev

am: 4edcb927ab

Change-Id: I384020dab83593e815c0afc0d5c2657c9dcaacbc
This commit is contained in:
Salvador Martinez
2017-01-27 20:03:12 +00:00
committed by android-build-merger

Diff Content Not Available