summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-09 23:14:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-09 23:14:46 -0700
commit8615fdc15146d27cc2d3a8efbe57f0a425b19efb (patch)
tree94533f6a193ebc481e5d3c132ca7e57333d12c48 /services
parent510951e98bdb861130f38c087956cd05e0b41dcd (diff)
parent506d724cc356a7ba73995ef2929c65062277c83d (diff)
downloadframeworks_base-8615fdc15146d27cc2d3a8efbe57f0a425b19efb.zip
frameworks_base-8615fdc15146d27cc2d3a8efbe57f0a425b19efb.tar.gz
frameworks_base-8615fdc15146d27cc2d3a8efbe57f0a425b19efb.tar.bz2
am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp * commit '506d724cc356a7ba73995ef2929c65062277c83d': DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions