tree 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f
parent 825577f81baab994ec5902f98d49d76d0cfe2204
parent 2ac4ace15eb9cfeabbde0d4776e1c911dbd1241c
author Irfan Sheriff <isheriff@google.com> 1284564663 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1284564663 -0700

Merge "Add per network static IP settings"