tree 214580de8a3870cf182e846fc1dbad7395da4876
parent ee9208eab62e70e384912ffdc893102a880bd283
parent 07d1532b9626d536ac11b5470a3f707d1cfc442a
author Chris Craik <ccraik@google.com> 1360797489 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360797489 -0800

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

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