OSDN Git Service

Merge "Fix NPE."
authorDaniel Sandler <dsandler@google.com>
Wed, 16 Feb 2011 19:32:39 +0000 (11:32 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 Feb 2011 19:32:39 +0000 (11:32 -0800)

Trivial merge