tree e6d963f5d640f487f749c4eef7b17369c66cf1b2
parent 45f8aaca7c0fb8e643a35c7e5fbaf5b8d02480ba
parent 02e391585d1a7eeccba13d02c69bd2e31cfddc0e
author John Reck <jreck@google.com> 1467047184 +0000
committer android-build-merger <android-build-merger@google.com> 1467047184 +0000

Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Idcba5c8393609034b70382844d499b45759b5e6d