am fce88928: (-s ours) Revert "Merge commit \'50738779\' into gingerbread-plus-aosp" - do not merge

* commit 'fce88928fef25777a0e409e2ed6e19fe0da0b8c6':
  Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge