am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1

* commit '67d54ac017494229eed27a184159461d63201a9f':
  NPE in GMail / TextLine