| commit | 75bcc25865c7ea6a408929be508993beb9d3da16 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:19:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:19:18 2012 -0700 |
| tree | 5dace0dadd29e10ce6e82b78b20bc7d51875933b | |
| parent | 5a9eea5bd6927c250fb414baa1f969bdf00396ea [diff] | |
| parent | a5a41674aa965eefaa7d66a5ab521d9e97c03e66 [diff] |
am a5a41674: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'a5a41674aa965eefaa7d66a5ab521d9e97c03e66': mako: disable WiFi background scan mako: disable WiFi roaming Revert "mako: enable WiFi roaming"