aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGEWink Saville2012-07-171-1/+1
* Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | |\
* | | | am aeceb517: adb: Fix adb tcpip commandBenoit Goby2012-06-121-3/+3
|\| | |
| * | | adb: Fix adb tcpip commandBenoit Goby2012-06-121-3/+3
| |/ /
* | | am 0f3974c3: Merge "Enable tracing on user builds" into jb-devJamie Gennis2012-06-122-5/+32
|\| |
| * | Merge "Enable tracing on user builds" into jb-devJamie Gennis2012-06-112-5/+32
| |\ \
| | * | Enable tracing on user buildsJamie Gennis2012-06-082-5/+32
* | | | am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"Jean-Baptiste Queru2012-06-111-1/+10
|\ \ \ \
| * \ \ \ am 91e5551f: Merge "toolbox: rmmod: fix module unloading"Jean-Baptiste Queru2012-06-111-1/+10
| |\ \ \ \
| | * \ \ \ Merge "toolbox: rmmod: fix module unloading"Jean-Baptiste Queru2012-06-111-1/+10
| | |\ \ \ \
| | | * | | | toolbox: rmmod: fix module unloadingVishal Bhoj2012-05-151-1/+10
* | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | am 9cec175c: Remove a stray newline in the backtrace output.Jeff Brown2012-06-081-1/+1
|\| | | | | |
| * | | | | | Remove a stray newline in the backtrace output.Jeff Brown2012-06-081-1/+1
* | | | | | | resolved conflicts for merge of 053b8654 to jb-dev-plus-aospJeff Brown2012-06-0814-891/+1324
|\| | | | | |
| * | | | | | Enhance native stack dumps.Jeff Brown2012-06-0814-893/+1326
* | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | am 5f2d00b0: rootdir: init.rc: remove audio app/sys groups, merge to fgDima Zavin2012-06-051-16/+2
|\| | | | | |
| * | | | | | rootdir: init.rc: remove audio app/sys groups, merge to fgDima Zavin2012-06-041-16/+2
* | | | | | | am 29319a67: cutils: sched_policy: remove audio app/sys groups, merge into fgDima Zavin2012-06-051-31/+4
|\| | | | | |
| * | | | | | cutils: sched_policy: remove audio app/sys groups, merge into fgDima Zavin2012-06-041-31/+4
* | | | | | | am df44b886: core: init.rc: create apps cgroup for fg tasks, move bg under itDima Zavin2012-06-051-13/+13
|\| | | | | |
| * | | | | | core: init.rc: create apps cgroup for fg tasks, move bg under itDima Zavin2012-06-041-13/+13
* | | | | | | am 13ed76bf: cutils: sched_policy: make bg group be nested under fgDima Zavin2012-06-051-4/+4
|\| | | | | |
| * | | | | | cutils: sched_policy: make bg group be nested under fgDima Zavin2012-06-041-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData"Robert Greenwalt2012-05-301-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am ff856a2b: Merge "Add error handling to SocketClient::sendData"Robert Greenwalt2012-05-301-5/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Add error handling to SocketClient::sendData"Robert Greenwalt2012-05-301-5/+5
| | |\ \ \ \
| | | * | | | Add error handling to SocketClient::sendDataMattias Falk2012-05-291-5/+5
| | |/ / / /
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-290-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | am a802b837: am 1d5e7885: Merge "toolbox: implement rm -f flag"Jean-Baptiste Queru2012-05-251-13/+40
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 1d5e7885: Merge "toolbox: implement rm -f flag"Jean-Baptiste Queru2012-05-251-13/+40
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "toolbox: implement rm -f flag"Jean-Baptiste Queru2012-05-251-13/+40
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | toolbox: implement rm -f flagTanguy Pruvot2012-05-061-13/+40
* | | | | | am 88f11846: audio policy: allow disabling A2DP for media.Eric Laurent2012-05-241-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | audio policy: allow disabling A2DP for media.Eric Laurent2012-05-241-0/+1
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am ddf07b41: Merge "Reuse system properties for p2p" into jb-devIrfan Sheriff2012-05-231-43/+60
|\| | | | |
| * | | | | Merge "Reuse system properties for p2p" into jb-devIrfan Sheriff2012-05-231-43/+60
| |\ \ \ \ \
| | * | | | | Reuse system properties for p2pIrfan Sheriff2012-05-231-43/+60
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| |/| | | | | |
| * | | | | | | Increase cpu.rt_runtime_us to 10% for fg and bg groupsColin Cross2012-05-161-2/+2
* | | | | | | | Fix buildJean-Baptiste Queru2012-05-161-2/+0