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

* commit 'f2c44a79d90096e5f0edf698e27d291d439f0138':
  Fix a crash