am 47ffa461: (-s ours) am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1

* commit '47ffa461676cae538fbe10da52f309f6cd24fed9':
  DO NOT MERGE: Almost all warnings are now errors in RS build.