| commit | d9f943ff41896e8d249fd407e567e0f9561a12c0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 20 07:20:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 20 07:20:16 2013 -0700 |
| tree | e1443bdaefb63451d6309196a3db42a695049b31 | |
| parent | e86a936afddaa823d8454c09ed43c2d864ac77eb [diff] | |
| parent | 40f20235380b245ec29b09e10792047b9b01d6f1 [diff] |
am 40f20235: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '40f20235380b245ec29b09e10792047b9b01d6f1': Revert "wifi: Get full scan results" add ViewGroup's layoutMode attribute to public resources bug: 9359960