Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcb18377 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am df8b777d: (-s ours) Reconcile with jb-mr1-release - do not merge 

* commit 'df8b777d':
  ScaleGestureDetector bugfixes
  Reverting public setSoWriteTimeout
  Fix Wifi Stress test after wifi settings are moved to Settings.global
  Assign default texture id of 0
parents 3201f2d4 df8b777d

There are no changes