OSDN Git Service

Merge "Fix NPE" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Fri, 19 Oct 2012 16:07:01 +0000 (09:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Oct 2012 16:07:02 +0000 (09:07 -0700)

Trivial merge