| commit | 846bd72492f52b40994e6c2ebd37a808e262b139 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 10:57:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 10:57:34 2013 -0700 |
| tree | 70f72149a16d0aaab0e66d12a04fe72111331819 | |
| parent | 2da1ded72203a915dfb441f661e39a2929236cef [diff] | |
| parent | 4325b9f9d9b03a4c30c2570ba9e5fb417d1daa4b [diff] |
am 4325b9f9: am 4e7469c4: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '4325b9f9d9b03a4c30c2570ba9e5fb417d1daa4b': DO NOT MERGE JAPAN(440,441): 110,118,119,112,911 mako: wifi: Channels blocking in no service - do not merge