tree fb519efc79fea3bc9d6b0ab3fe283db26f3b220e
parent b1c51e6b1e401e5e4dea1ffc25a7a3111ea5a1be
parent 51ddc176abd23bd3ddbc26124e5541a983a1db07
author Etan Cohen <etancohen@google.com> 1558547077 -0700
committer android-build-merger <android-build-merger@google.com> 1558547077 -0700

Merge "[CM] Fix NPE due to unvalidated callback value" am: 31717ff7f5
am: 51ddc176ab

Change-Id: Idf439c1f6badd715776eaaced1a781b066ba6d37