The Android Open Source Project 1795d18f81 am 2c3265af: merge from open-source master ...

Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken

* commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40':
  Display current IP address in advanced Wifi settings screen

2010-04-21 09:51:01 -07:00

..

android/settings

am 2c3265af: merge from open-source master

2010-04-21 09:51:01 -07:00