tree 51c052ddc66c30afd10d97660882e58a854e0fb1
parent 8503af848657356411a9bb4cf15d798d4f15111b
parent 4aeca7c5908387bc7efb0785830aea1053264062
author Irfan Sheriff <isheriff@google.com> 1300128515 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300128515 -0700

Merge "Backup and restore IP and proxy settings" into honeycomb-mr1