| commit | f15634ccf9a2dffdbe1c363e438388192a2ac5e1 | [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 | 86885fd19d28e368702852ab8c9347e87eed7ba8 | |
| parent | 9510bd46e158b433f7c8cb237a5cc2b3bd57f785 [diff] | |
| parent | 8edbe22afeb480cbb52e64db98466f414b05086b [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.