summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-20 13:42:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-20 13:42:25 -0700
commit8b569c8d49924d849793513a5418ef0350320962 (patch)
treed656e13ccbcba19b1593a198f919f33f096d2383 /wifi/java/android/net
parentb90b9d54eb6bbc3a4045ff0bf46d3366822e835e (diff)
parent42f90ca54fc4c6e0bdbde7caa7d10b6090d11960 (diff)
downloadframeworks_base-8b569c8d49924d849793513a5418ef0350320962.zip
frameworks_base-8b569c8d49924d849793513a5418ef0350320962.tar.gz
frameworks_base-8b569c8d49924d849793513a5418ef0350320962.tar.bz2
am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
Merge commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960' into gingerbread-plus-aosp * commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960': Fix aapt dump badging to support xlarge screens.
Diffstat (limited to 'wifi/java/android/net')
0 files changed, 0 insertions, 0 deletions