summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-29 17:45:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-07-29 17:45:56 -0700
commitefe6039f71e9bac2138003b3287e94a7ab7e5c55 (patch)
tree7c7545aef44e4ee356f61b0379210f61b2a83691 /services
parent3cc219dfc67b866e10828f0c17641668d47c1cd8 (diff)
parent68335fdd6e9c1d622384612605d6952503cb7fd0 (diff)
downloadframeworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.zip
frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.tar.gz
frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.tar.bz2
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions