OSDN Git Service

Merge "Guard against a possible NPE when the rendering fails." into tools_r12
authorXavier Ducrohet <xav@android.com>
Wed, 29 Jun 2011 01:22:56 +0000 (18:22 -0700)
committerAndroid Code Review <code-review@android.com>
Wed, 29 Jun 2011 01:22:56 +0000 (18:22 -0700)

Trivial merge