OSDN Git Service

Merge "Fix NPE"
authorIrfan Sheriff <isheriff@google.com>
Tue, 14 Feb 2012 06:33:14 +0000 (22:33 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 Feb 2012 06:33:14 +0000 (22:33 -0800)

Trivial merge