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

Skip to content
Commit 71d2a874 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release 

* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
  Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
parents c20a7f1a 2009c2f0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment