diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-04 15:01:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 15:01:30 +0000 |
| commit | 7040b12bb2f83209bbccd0149d365e2d106adc74 (patch) | |
| tree | 88193780bffad233d9cb7237a83bda250c364c11 /media/libeffects/lvm | |
| parent | 28bb5bd7b8ecba7f278d2cadd21bdd1286eea655 (diff) | |
| parent | fc1a3ac1641b8849bf925a6bf0fa96b2abcdd91f (diff) | |
| download | frameworks_av-7040b12bb2f83209bbccd0149d365e2d106adc74.zip frameworks_av-7040b12bb2f83209bbccd0149d365e2d106adc74.tar.gz frameworks_av-7040b12bb2f83209bbccd0149d365e2d106adc74.tar.bz2 | |
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"
Diffstat (limited to 'media/libeffects/lvm')
0 files changed, 0 insertions, 0 deletions