| commit | 8c1f0b3fafcecbdf5197dceb87e22fe2758c4dd6 | [log] [tgz] |
|---|---|---|
| author | vandwalle <vandwalle@google.com> | Wed Aug 27 14:11:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 14:11:21 2014 +0000 |
| tree | 5b74454932c55958ddfbaa7110c2081993777822 | |
| parent | a99a47b004e58beabbf8e633fd9d62789f07623f [diff] | |
| parent | 567943bdcf7ebee266b05f11897d4ac2bc11fe9c [diff] |
am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev * commit 'f7c9ffc381b4f8001caacfdd82386f0b060e4dd1': fix ScanResult read from parcel, this function was broken and causes wifi settings to crash