summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Albert <aalbert@google.com>2010-12-28 15:09:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-28 15:09:09 -0800
commitf15634ccf9a2dffdbe1c363e438388192a2ac5e1 (patch)
tree86885fd19d28e368702852ab8c9347e87eed7ba8
parent9510bd46e158b433f7c8cb237a5cc2b3bd57f785 (diff)
parent8edbe22afeb480cbb52e64db98466f414b05086b (diff)
downloadframeworks_native-f15634ccf9a2dffdbe1c363e438388192a2ac5e1.zip
frameworks_native-f15634ccf9a2dffdbe1c363e438388192a2ac5e1.tar.gz
frameworks_native-f15634ccf9a2dffdbe1c363e438388192a2ac5e1.tar.bz2
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.
0 files changed, 0 insertions, 0 deletions