| commit | 79baff190de5f2cb9c9a4c9d2eb4d835974239ac | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Wed Feb 13 15:18:06 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 13 15:18:06 2013 -0800 |
| tree | 59ea7235345a0dd4e12c4c19cfac6be68f704db1 | |
| parent | 4887892d528ace2b57fc2a00d8b9b76afbb4e597 [diff] | |
| parent | 6291edbe990862550581ab162e0e72b0722a8b54 [diff] |
am 6291edbe: (-s ours) Merge "Revert "Merge remote-tracking branch \'goog/master-chromium\' into \'goog/master\'" DO NOT MERGE" # Via Android (Google) Code Review (1) and Chris Craik (1) * commit '6291edbe990862550581ab162e0e72b0722a8b54': Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE