| commit | f79f276ab07b3cf57e1f3dd82bcbdafde2ad00a9 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Dec 01 11:20:52 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 01 11:20:52 2010 -0800 |
| tree | aad37749d50f5e3bdd41946934aec27284cc4b77 | |
| parent | b914985cddfa2b06b999ae1447e4c72935c12519 [diff] | |
| parent | 2f28b822dac1f00e26794f4d04bf2f0b73188907 [diff] |
am 869fa653: (-s ours) resolved conflicts for merge of 52556689 to gingerbread-plus-aosp * commit '869fa653e0880fc1f389eb51524bef5183bf713e': DO NOT MERGE Fix status fetch from supplicant