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 | c89d527996f16bb8f14884cc0935555fffc0789c (patch) | |
| tree | ac017f52ddfde6e9343b3a9331ba918793a4f9dd /docs/html/sdk/api_diff/12/changes | |
| parent | 8d317b5be8959462a6acc889ade95b338ce7a442 (diff) | |
| parent | 11b49ba933bab7ff8262139141eef0e5f3c45a18 (diff) | |
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 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions