tree 10b1cdb4875ab80292963d520bf33ffd35b8a187
parent 92f7fab9f623c5cba3e2df8def68f6372ad17e5c
parent 05b2d3eb0defbcc7f4e2aa270cfa179e256e0aeb
author Michael Wright <michaelwr@google.com> 1484792206 +0000
committer android-build-merger <android-build-merger@google.com> 1484792206 +0000

Merge "Validate custom pointer icons aren't null." into cw-f-dev
am: 05b2d3eb0d

Change-Id: I3a11e06dfe3f476b791838241bfb36e5362063ab