diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-02 17:59:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 17:59:05 +0000 |
| commit | ef7a78943ddbd22170cbf430aa9d2b2d9603d69c (patch) | |
| tree | 885385c729bf6673721c7b3bdb5685d9abf4ea74 /media/libmediaplayerservice/nuplayer/NuPlayer.cpp | |
| parent | b47568c9e85432d24b5d22005260a9879d03fae9 (diff) | |
| parent | 254c2211b5088bb7d84d7126306aad7763b58372 (diff) | |
| download | frameworks_av-ef7a78943ddbd22170cbf430aa9d2b2d9603d69c.zip frameworks_av-ef7a78943ddbd22170cbf430aa9d2b2d9603d69c.tar.gz frameworks_av-ef7a78943ddbd22170cbf430aa9d2b2d9603d69c.tar.bz2 | |
am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
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"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.cpp')
0 files changed, 0 insertions, 0 deletions