summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2010-10-22 18:31:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-22 18:31:38 -0700
commit072fabc0e544e85ca0f8e483cc104875ac4b8869 (patch)
tree343ae617a362e6a51786795914a73ecdc108517d /wifi/java/android
parent5dcf000117ba97e13c6c6d1d5105c0fa49fa48f6 (diff)
parentd3f5bf5aac395cdc7c2faa173141b69adea6e274 (diff)
downloadframeworks_base-072fabc0e544e85ca0f8e483cc104875ac4b8869.zip
frameworks_base-072fabc0e544e85ca0f8e483cc104875ac4b8869.tar.gz
frameworks_base-072fabc0e544e85ca0f8e483cc104875ac4b8869.tar.bz2
am d3f5bf5a: am ecae6e06: Merge "Import translations for status bar." into gingerbread
Merge commit 'd3f5bf5aac395cdc7c2faa173141b69adea6e274' * commit 'd3f5bf5aac395cdc7c2faa173141b69adea6e274': Import translations for status bar.
Diffstat (limited to 'wifi/java/android')
0 files changed, 0 insertions, 0 deletions