summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-09-11 09:32:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-11 09:32:26 -0700
commit764b0c6c66c9e093f246f5bf4085ee815557e034 (patch)
treecb2b3c5d809ff7c0c712464e4598d25e8809b2f3 /core/java/android
parenta1103f336d01d0a5dcb07afc89cd1bc7ec0ece69 (diff)
parent79253f8b4223976c010e52a34e8785648c8fb074 (diff)
downloadframeworks_base-764b0c6c66c9e093f246f5bf4085ee815557e034.zip
frameworks_base-764b0c6c66c9e093f246f5bf4085ee815557e034.tar.gz
frameworks_base-764b0c6c66c9e093f246f5bf4085ee815557e034.tar.bz2
am 79253f8b: Merge change 24690 into donut
Merge commit '79253f8b4223976c010e52a34e8785648c8fb074' into eclair * commit '79253f8b4223976c010e52a34e8785648c8fb074': docs only.
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions