summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-14 19:09:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 19:09:52 -0700
commit27f962f985eea0157922ebe80c44efbf6889725d (patch)
tree01c011c8b7ad5086ce0256debed2748ce3ccc6be /include
parent74841381430fedc0abcdfd2dfb7545a4da8b9ad6 (diff)
parentf335f421310338bdd8ba2eddbc4e5921d46511fa (diff)
downloadframeworks_native-27f962f985eea0157922ebe80c44efbf6889725d.zip
frameworks_native-27f962f985eea0157922ebe80c44efbf6889725d.tar.gz
frameworks_native-27f962f985eea0157922ebe80c44efbf6889725d.tar.bz2
am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit '68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken * commit '68ca59e9e69ab4c997987fb0390382a2461386eb': Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions