tree 94224b6fc290690ba6ea553561ea01c21c59dbe4
parent 5ff11851d1d200d20f6414fb109801314b72e57e
parent 455b107800e69ea7615ffad1a83bb250d699f6ae
author Chris Craik <ccraik@google.com> 1360797488 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360797488 -0800

am 455b1078: (-s ours) Revert "Merge remote-tracking branch \'goog/master-chromium\' into \'goog/master\'" DO NOT MERGE

# Via Chris Craik
* commit '455b107800e69ea7615ffad1a83bb250d699f6ae':
  Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE