tree 58ec93d715dd7d07aa4dc0bfe7c262c11e4ada98
parent 8b684a9faad3594f4ee30e2618f6725d13fc0368
parent a9389bf5933cc496871d4fd30915d7bb13b72646
author Michael Wright <michaelwr@google.com> 1484793047 +0000
committer android-build-merger <android-build-merger@google.com> 1484793047 +0000

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

Change-Id: If9f4402b7dba2efa386f4c008b9e1477b753a282