tree 1c5a53836b6aaa3505f627ac5ef327c996614306
parent 9b8e9a1ee9bc80e4db62232f5422db563c8fbca2
parent 94fc026afa5db68f85e33d452bc9de66e06fce9e
author Android Build Merger (Role) <android-build-merger@google.com> 1484792517 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484792519 +0000

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