OSDN Git Service

Merge "Guard against NPE"
authorTor Norbye <tnorbye@google.com>
Mon, 7 Feb 2011 19:05:19 +0000 (11:05 -0800)
committerAndroid Code Review <code-review@android.com>
Mon, 7 Feb 2011 19:05:19 +0000 (11:05 -0800)

Trivial merge