Commits
The Android Open Source Project authored and Android Git Automerger committed dcb18377496M
am df8b777d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'df8b777d260e0801f98dc46dfe728a1f7548f144': ScaleGestureDetector bugfixes Reverting public setSoWriteTimeout Fix Wifi Stress test after wifi settings are moved to Settings.global Assign default texture id of 0
Showing diff to3201f2d427d