am c81d7e0a: am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1

* commit 'c81d7e0ae802626e9e7a09bdc70afe4952c2ac96':
  Fix a crash