am e920477e: Merge "do not merge" into gingerbread

Merge commit 'e920477e862b90778cdc8e2e221a20d8f3a86878' into gingerbread-plus-aosp

* commit 'e920477e862b90778cdc8e2e221a20d8f3a86878':
  do not merge