Commits
The Android Open Source Project authored and Android Git Automerger committed d9f943ff418M
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
Showing diff toe86a936afdd