am e2fc49ac: am 5c2a4684: Merge "Supercalifragilisticexpialidocious." into gingerbread

Merge commit 'e2fc49ac1b16b88c471975d980bb836ee7d90201'

* commit 'e2fc49ac1b16b88c471975d980bb836ee7d90201':
  Supercalifragilisticexpialidocious.