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

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