tree 58ec93d715dd7d07aa4dc0bfe7c262c11e4ada98
parent 66e3b3114a22a9cf410a69f6c0286b13f53cab43
parent e97ec8ca9d1eea2837e41d8ee9a85134e3ea94a1
author Michael Wright <michaelwr@google.com> 1484792749 +0000
committer android-build-merger <android-build-merger@google.com> 1484792749 +0000

Merge "Validate custom pointer icons aren't null. am: 35068079c8 am: 92f7fab9f6" into nyc-mr2-dev-plus-aosp
am: e97ec8ca9d

Change-Id: Ib199cbf80ca2f8711f8968989f2cffe9dbffec7e