summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-05-06 17:17:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-06 17:17:51 -0700
commitcaa63341a890fee8dba9f3edc9c20ae5cec46b36 (patch)
tree9375ec1fc694b916a5a3a39ac06a2151de1aac1d /libs
parentb658cc42aa69483469aed2cd09057eb66380dc92 (diff)
parentd6d115173a856fe28cf5a3087f6d7b0de77495c5 (diff)
downloadframeworks_base-caa63341a890fee8dba9f3edc9c20ae5cec46b36.zip
frameworks_base-caa63341a890fee8dba9f3edc9c20ae5cec46b36.tar.gz
frameworks_base-caa63341a890fee8dba9f3edc9c20ae5cec46b36.tar.bz2
am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5' into kraken * commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5': Fix ThrottleService wifi interaction
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions