summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-01-28 14:19:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-28 14:19:36 -0800
commit287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4 (patch)
tree5e9d99c6040d2b2abd3189fc38c83295d1720b64 /core/java/android/net
parent30a85ec7e8d79448fbd0d0af3ac25b656f8428c4 (diff)
parent5f2def8cfdad2491a646be69347444a3be6ddf84 (diff)
downloadframeworks_base-287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4.zip
frameworks_base-287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4.tar.gz
frameworks_base-287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4.tar.bz2
am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84': Import revised translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/net')
0 files changed, 0 insertions, 0 deletions