summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-03-14 12:10:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-14 12:10:27 -0700
commitfd10d5cf56e5b1ba7692400e4fe4ae26b61f3285 (patch)
treec4abd7fae1e2b31973da821fd6ad90178c62cdfd /include
parent6ffbe9855347fb2e045c1383c166ff39b5d08c90 (diff)
parentfb8971106e5ea105e176c995c1ff3b4fbe630710 (diff)
downloadframeworks_base-fd10d5cf56e5b1ba7692400e4fe4ae26b61f3285.zip
frameworks_base-fd10d5cf56e5b1ba7692400e4fe4ae26b61f3285.tar.gz
frameworks_base-fd10d5cf56e5b1ba7692400e4fe4ae26b61f3285.tar.bz2
am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710': Backup and restore IP and proxy settings
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions