tree 1c5a53836b6aaa3505f627ac5ef327c996614306
parent 6497bf0e58807daedd945b6988d8691835e1d783
parent b1ccd81fba2deb4f0befa97610b3ec044eae8e26
author Michael Wright <michaelwr@google.com> 1484792681 +0000
committer android-build-merger <android-build-merger@google.com> 1484792681 +0000

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

Change-Id: I6dc28541e6c52de28bf22b6bb111a0f9f5dcb235