summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-factoryrom-2-releaseandroid-sdk-adt_r16.0.1android-cts-4.0_r1The Android Open Source Project2011-11-160-0/+0
|\
| * Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1The Android Automerger2011-11-023-34/+27
| * Revert "Merge "charger: make the almost-full frame only show when it's curren...The Android Automerger2011-11-021-10/+1
| * Revert "Merge "Remove log spam" into ics-mr0"The Android Automerger2011-11-021-0/+1
| * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\
| | * Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"The Android Automerger2011-11-023-34/+27
| | * Revert "Merge "charger: make the almost-full frame only show when it's curren...The Android Automerger2011-11-021-10/+1
| | * Revert "Merge "Remove log spam" into ics-mr0"The Android Automerger2011-11-021-0/+1
| | * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |/|
| | * Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"The Android Automerger2011-11-023-34/+27
| |/
* / rootdir: init.rc: write default oom_adj before starting ueventdandroid-4.0.2_r1Dima Zavin2011-11-041-3/+3
|/
* Merge "libnl_2: Fix memory leaks" into ics-mr0Dmitry Shmidt2011-11-013-27/+34
|\
| * libnl_2: Fix memory leaksDmitry Shmidt2011-11-013-27/+34
* | Merge "charger: make the almost-full frame only show when it's current level"...Dima Zavin2011-11-011-1/+10
|\ \ | |/ |/|
| * charger: make the almost-full frame only show when it's current levelDima Zavin2011-10-311-1/+10
* | Merge "Remove log spam" into ics-mr0Irfan Sheriff2011-11-011-1/+0
|\ \ | |/ |/|
| * Remove log spamIrfan Sheriff2011-10-291-1/+0
* | Reconcile with AOSP masterJean-Baptiste Queru2011-10-280-0/+0
|\ \
| * | Fix buildSteve Block2011-10-281-0/+3
* | | Fix the class_reset commandKen Sumrall2011-10-263-1/+7
| |/ |/|
* | [maguro] : add setprop net.tcp.buffersize.hspasinikang2011-10-171-0/+1
* | charger: key state being the same is not an errorDima Zavin2011-10-131-1/+1
* | Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0Dima Zavin2011-10-131-14/+30
|\ \
| * | charger: ignore key event if value didn't changeDima Zavin2011-10-121-0/+4
| * | charger: sync with the current key state on bootDima Zavin2011-10-121-13/+25
| * | charger: print last_kmsg directly using klog_writeDima Zavin2011-10-121-1/+1
* | | Update camera documentation about face detection.Wu-cheng Li2011-10-121-2/+1
|/ /
* | Merge "Add log group to rild to improve log collection on modem issue"Wink Saville2011-10-101-1/+1
|\ \
| * | Add log group to rild to improve log collection on modem issueKazuhiro Ondo2011-09-301-1/+1
* | | Merge "Add drmrpc group to mediaserver and drmserver so they can make the drm...Jeffrey Tinker2011-10-071-2/+2
|\ \ \
| * | | Add drmrpc group to mediaserver and drmserver so they can make the drm rpc callsJeffrey Tinker2011-10-061-2/+2
* | | | Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."Wu-cheng Li2011-10-071-2/+2
|\ \ \ \
| * | | | Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.Wu-cheng Li2011-10-071-2/+2
* | | | | Merge "Add checking for log entry format"Kenny Root2011-10-052-7/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add checking for log entry formatKenny Root2011-10-032-7/+19
* | | | | Merge "Add command line help for the new 'adb backup -all -nosystem'"Christopher Tate2011-10-041-5/+9
|\ \ \ \ \
| * | | | | Add command line help for the new 'adb backup -all -nosystem'Christopher Tate2011-10-031-5/+9
| |/ / / /
* | | | | Merge "Create drmrpc group for security services"Jeffrey Tinker2011-10-041-0/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Create drmrpc group for security servicesJeffrey Tinker2011-09-301-0/+2
| * | | merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| |\ \ \
| | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | |\ \ \
| | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-070-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-050-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-310-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | |/| | | | | | | | | | | |/|/ / /
| | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-08-290-0/+0
| | | | | | | | | |\ \ \