summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-01-14 19:28:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-14 19:28:24 -0800
commit0152360d8b419ddd0fd5b1d701932f96d5839276 (patch)
treee31dfd9eefb2942932cda98e09df32d1a305cca0 /wifi/java/android
parent5bd48b528e6477c2c3d318cb71cef861392b1b8a (diff)
parenta99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03 (diff)
downloadframeworks_base-0152360d8b419ddd0fd5b1d701932f96d5839276.zip
frameworks_base-0152360d8b419ddd0fd5b1d701932f96d5839276.tar.gz
frameworks_base-0152360d8b419ddd0fd5b1d701932f96d5839276.tar.bz2
am a99a9f4f: am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit 'a99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03': Manual fix for some Norwegian format strings.
Diffstat (limited to 'wifi/java/android')
0 files changed, 0 insertions, 0 deletions