OSDN Git Service

Merge "NPE safeguard"
authorTor Norbye <tnorbye@google.com>
Mon, 23 May 2011 18:27:44 +0000 (11:27 -0700)
committerAndroid Code Review <code-review@android.com>
Mon, 23 May 2011 18:27:44 +0000 (11:27 -0700)

Trivial merge