summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1Nick Pelly2011-11-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - disable memory dumps" into ics-mr1Andy McFadden2011-11-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - disable memory dumpsAndy McFadden2011-11-161-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | am c6023243: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with ics-factoryrom-2-releaseandroid-sdk-adt_r16.0.1android-cts-4.0_r1The Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/statsJP Abgrall2011-11-091-1/+3
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Wimax: wimax related changes for libnetutils" into ics-mr1Robert Greenwalt2011-11-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Wimax: wimax related changes for libnetutilstk.mun2011-11-071-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventdDima Zavin2011-11-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | rootdir: init.rc: write default oom_adj before starting ueventdandroid-4.0.2_r1Dima Zavin2011-11-041-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-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
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0Dmitry Shmidt2011-11-013-27/+34
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "libnl_2: Fix memory leaks" into ics-mr0Dmitry Shmidt2011-11-013-27/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | libnl_2: Fix memory leaksDmitry Shmidt2011-11-013-27/+34
* | | | | | | | | | | | | | | | | | | | | | | | am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s ...Dima Zavin2011-11-011-1/+10
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | am d4f29767: Merge "Remove log spam" into ics-mr0Irfan Sheriff2011-11-011-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Remove log spam" into ics-mr0Irfan Sheriff2011-11-011-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Remove log spamIrfan Sheriff2011-10-291-1/+0
* | | | | | | | | | | | | | | | | | | | | | | restart surfaceflinger and drmserver when servicemanager diesMathias Agopian2011-10-311-0/+2
| |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Gracefully handle truncated log messages." into ics-mr1Jeff Sharkey2011-10-281-6/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Gracefully handle truncated log messages.Jeff Sharkey2011-10-261-6/+23
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am 604f52e3: Reconcile with AOSP masterJean-Baptiste Queru2011-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Reconcile with AOSP masterJean-Baptiste Queru2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Fix buildSteve Block2011-10-281-0/+3
* | | | | | | | | | | | | | | | | | | | | | am a286480f: Fix the class_reset commandKen Sumrall2011-10-263-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix the class_reset commandKen Sumrall2011-10-263-1/+7
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Enable verbose register memory dumpsAndy McFadden2011-10-191-1/+1
* | | | | | | | | | | | | | | | | | | | Merge "Add log summary to tombstones"Andy McFadden2011-10-192-26/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add log summary to tombstonesAndy McFadden2011-10-182-26/+103
* | | | | | | | | | | | | | | | | | | | | Merge "liblog: do better checks of log messages."Nick Kralevich2011-10-191-14/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | liblog: do better checks of log messages.Nick Kralevich2011-10-181-14/+19
* | | | | | | | | | | | | | | | | | | | | Merge "Enhance debuggerd memory dumps"Andy McFadden2011-10-181-54/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / /
| * | | | / / / / / / / / / / / / / / / Enhance debuggerd memory dumpsAndy McFadden2011-10-181-54/+103
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "logcat: add sanity check"Nick Kralevich2011-10-181-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | logcat: add sanity checkNick Kralevich2011-10-171-0/+5
* | | | | | | | | | | | | | | | | | | am aa75df74: [maguro] : add setprop net.tcp.buffersize.hspasinikang2011-10-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | [maguro] : add setprop net.tcp.buffersize.hspasinikang2011-10-171-0/+1