summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-04-14 20:25:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 20:25:51 -0700
commit1424d1d22e199c716c5d248611e58ce7c3f15c7e (patch)
tree9665332d124fee109cfe3160aca908e3407fb7ba /api
parent0751d1eaad55603eaeb0f035a55935f713ab0476 (diff)
parent8090edae9ed1228e8cbaa14dd94c6ce885a0b729 (diff)
downloadframeworks_base-1424d1d22e199c716c5d248611e58ce7c3f15c7e.zip
frameworks_base-1424d1d22e199c716c5d248611e58ce7c3f15c7e.tar.gz
frameworks_base-1424d1d22e199c716c5d248611e58ce7c3f15c7e.tar.bz2
am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp * commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729': Sholes mobile iface comes/goes - handle the reset
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions