Commits · 0ca952ca020a2056915ca1ae041068120e8f8150 · e / devices / smdk4412 / android_frameworks_native · GitLab

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

This project is mirrored from https://github.com/LineageOS/android_frameworks_native. Pull mirroring updated Sep 22, 2025.

Jan 05, 2012
- am d1a82292: am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 · 0ca952ca
  Scott Main authored Jan 05, 2012
  0ca952ca
- am b1483cb9: am d32ee5ba: Reconcile with ics-mr1-release · cf235b8c
  The Android Open Source Project authored Jan 05, 2012
  cf235b8c
- am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 · 3032c5f4
  Scott Main authored Jan 05, 2012
  3032c5f4
- am d32ee5ba: Reconcile with ics-mr1-release · d9f8d8b0
  The Android Open Source Project authored Jan 05, 2012
  d9f8d8b0
- am 32350c7a: Merge "Filter our v6 address from tethering dns." · 9099dc0e
  Robert Greenwalt authored Jan 05, 2012
  9099dc0e
- Merge "Filter our v6 address from tethering dns." · 75e4c00d
  Robert Greenwalt authored Jan 05, 2012
  
  75e4c00d
- am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 · b34baf5f
  Scott Main authored Jan 05, 2012
  b34baf5f
- Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 · 55ec7111
  Scott Main authored Jan 05, 2012
  55ec7111
- Merge "Adding light script to scenegraph. Patching up the collada parser to... · 0af04eaa
  Alex Sakhartchouk authored Jan 05, 2012
  0af04eaa
- am 6b14d585: Merge "Remove the notion of "active track" from mixer" · d4ac28f8
  Glenn Kasten authored Jan 05, 2012
  d4ac28f8
- Merge "Remove the notion of "active track" from mixer" · e2343842
  Glenn Kasten authored Jan 05, 2012
  
  e2343842
- Reconcile with ics-mr1-release · ddf6c13a
  The Android Open Source Project authored Jan 05, 2012
  ddf6c13a
- am a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" · 5abae642
  Glenn Kasten authored Jan 05, 2012
  5abae642
- Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" · 2adea706
  Glenn Kasten authored Jan 05, 2012
  
  2adea706
- Use the standard CC_LIKELY and CC_UNLIKELY macros · 99ed2241
  Glenn Kasten authored Dec 15, 2011
  99ed2241
- am 9a03482c: am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall... · ebfde6f1
  Wink Saville authored Jan 04, 2012
  ebfde6f1
- am efd617e0: am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha... · 8a47a432
  Wink Saville authored Jan 04, 2012
  8a47a432
- am 7da207b5: am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 · a0d738a6
  Wink Saville authored Jan 04, 2012
  a0d738a6
- am 39f05540: am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file://... · aa63ad58
  Bart Sears authored Jan 04, 2012
  aa63ad58
- am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 · e03e4949
  Wink Saville authored Jan 04, 2012
  e03e4949
- am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 · cebce139
  Wink Saville authored Jan 04, 2012
  cebce139
- am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 · f66dbb14
  Wink Saville authored Jan 04, 2012
  f66dbb14
- am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it... · 77f0a753
  Bart Sears authored Jan 04, 2012
  77f0a753
- am dc8627e7: resolved conflicts for merge of 1a4b9939 to master · 7d04e4d9
  Eric Laurent authored Jan 04, 2012
  7d04e4d9
- resolved conflicts for merge of 1a4b9939 to master · e9e2f6f7
  Eric Laurent authored Jan 04, 2012
  e9e2f6f7
- Merge "Adding better error behavior to RS" into graphics-dev · 00f261a1
  Alex Sakhartchouk authored Jan 04, 2012
  
  00f261a1
- Merge "Adding RS comments, cleaning up the gl implementation with new Element... · 1cf4dc39
  Alex Sakhartchouk authored Jan 04, 2012
  1cf4dc39
- merge in ics-mr1-release history after reset to ics-mr1 · 31815b4f
  The Android Automerger authored Jan 04, 2012
  
  31815b4f
Jan 04, 2012
- am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 · 42fdc6f3
  Wink Saville authored Jan 04, 2012
  42fdc6f3
- Merge "Enhancement on ICS data stall polling logic" into ics-mr1 · 103a6ff9
  Wink Saville authored Jan 04, 2012
  
  103a6ff9
- am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 · 0d69bb8a
  Wink Saville authored Jan 04, 2012
  0d69bb8a
- Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 · 4ee6427c
  Wink Saville authored Jan 04, 2012
  
  4ee6427c
- am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 · 5bdd1e8c
  Wink Saville authored Jan 04, 2012
  5bdd1e8c
- am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 · 53cc3c76
  Bart Sears authored Jan 04, 2012
  53cc3c76
- Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 · 624eef24
  Wink Saville authored Jan 04, 2012
  
  624eef24
- Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 · 66577b60
  Bart Sears authored Jan 04, 2012
  
  66577b60
- am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 · 2ae141d9
  Eric Laurent authored Jan 04, 2012
  2ae141d9
- Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 · 11cb4c04
  Eric Laurent authored Jan 04, 2012
  
  11cb4c04
- am 157fea64: gltrace: add user settings to control data captured. · 0b5f54a3
  Siva Velusamy authored Jan 04, 2012
  0b5f54a3
- am 193b4597: Merge "gltrace: add start time & duration to each traced call." · 7d473443
  Siva Velusamy authored Jan 04, 2012
  7d473443