| commit | 1795d18f815568c15b6fc1b1d3cf29b1c193f030 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:51:01 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 09:51:01 2010 -0700 |
| tree | e72d67f222f1bd000e9493922815e22be6b74434 | |
| parent | e7879010e3dbfd2db193055c60c9825004a3a51a [diff] | |
| parent | 2c3265af7419c35c1084fd5c1e4726abcdd90f40 [diff] |
am 2c3265af: merge from open-source master Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken * commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40': Display current IP address in advanced Wifi settings screen