summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-10-19 15:15:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-19 15:15:57 -0700
commit39f4408f994a37fd805c964c673ec7ad1702a817 (patch)
tree6d0521f9ae8d173ad921bfa088770451e6afc4e5 /core/java/android/os
parentb263450f7a5b6ff3c8be8cd4b16aa2f65978f657 (diff)
parentb5d69242d10021f82632d62c30b1ce63785c9386 (diff)
downloadframeworks_base-39f4408f994a37fd805c964c673ec7ad1702a817.zip
frameworks_base-39f4408f994a37fd805c964c673ec7ad1702a817.tar.gz
frameworks_base-39f4408f994a37fd805c964c673ec7ad1702a817.tar.bz2
am b5d69242: am ae26b8b6: Update 5.xml with last minute changes.
Merge commit 'b5d69242d10021f82632d62c30b1ce63785c9386' into eclair-mr2 * commit 'b5d69242d10021f82632d62c30b1ce63785c9386': Update 5.xml with last minute changes.
Diffstat (limited to 'core/java/android/os')
0 files changed, 0 insertions, 0 deletions