tree 1c5a53836b6aaa3505f627ac5ef327c996614306
parent 9b8e9a1ee9bc80e4db62232f5422db563c8fbca2
parent 24a1667145f7060c611a96be96830fd745610413
author Michael Wright <michaelwr@google.com> 1484792520 +0000
committer android-build-merger <android-build-merger@google.com> 1484792520 +0000

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

Change-Id: I0cff9d5dbdc4228ad8d02cd73259f60055fdb9bc