tree 504f794a1a91d639e8cdc83be3b5e9eafc79147b
parent 4718dfa473d9ee9259716c400ee79961c230eb15
parent 257a315e72d8b878b71f1735c8174cfe69cde8c7
author Raphael Moll <ralf@android.com> 1399075882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399075882 +0000

am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"

* commit '257a315e72d8b878b71f1735c8174cfe69cde8c7':
  Temporarily disable rs/bcc in win_sdk