| commit | 8e3e5165914cac9f9c671601f1d67d276245f9b2 | [log] [tgz] |
|---|---|---|
| author | Alon Albert <aalbert@google.com> | Tue Dec 28 15:09:09 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 28 15:09:09 2010 -0800 |
| tree | 7090145c985584b2181e32689c9048ed7759ba30 | |
| parent | 3d99f5b6ef3ffd9a5912e90c819af204b89afe57 [diff] | |
| parent | 2967aa3e6060f582f166cdb334a0fb9ff0cb4759 [diff] |
am 2967aa3e: (-s ours) am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread * commit '2967aa3e6060f582f166cdb334a0fb9ff0cb4759': Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.