OSDN Git Service

Merge "Defend against NPE." into klp-dev
authorDaniel Sandler <dsandler@android.com>
Thu, 15 Aug 2013 16:06:49 +0000 (16:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Aug 2013 16:06:49 +0000 (16:06 +0000)

Trivial merge