tree f775b94d5c0db43cbacbb0c2289e8111b8e2aa7a
parent bcefeb699d3a2a005b1739394f894b9659021cc5
parent e764165369bcab956941de8f3d530f97fbfdcf67
author Jason Monk <jmonk@google.com> 1447186226 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447186226 +0000

Merge "Context isn't good enough, actually check for null"