summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fs_mrg: clean up multi-type mount_allJP Abgrall2014-07-023-66/+100
* Added support for vendor partition to adbDaniel Rosenberg2014-07-024-48/+87
* Merge "fs_mgr: fix crash on "noemulatedsd" in fstab"Todd Poynor2014-07-011-6/+2
|\
| * fs_mgr: fix crash on "noemulatedsd" in fstabTodd Poynor2014-07-011-6/+2
* | healthd: fix 64-bit buildColin Cross2014-07-011-1/+1
* | Merge "charger: leave screen off when entered with very low battery"Todd Poynor2014-06-301-7/+23
|\ \ | |/
| * charger: leave screen off when entered with very low batteryTodd Poynor2014-06-301-7/+23
* | Define force usage and category for System Audio.Jungshik Jang2014-07-011-0/+3
* | am fac28281: am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of <s...Elliott Hughes2014-06-301-3/+0
|\ \
| * \ am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of <sys/_propertie...Elliott Hughes2014-06-301-3/+0
| |\ \
| | * \ am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>."Elliott Hughes2014-06-301-3/+0
| | |\ \
| | | * \ Merge "Remove an unused #include of <sys/_properties.h>."Elliott Hughes2014-06-271-3/+0
| | | |\ \
| | | | * | Remove an unused #include of <sys/_properties.h>.Elliott Hughes2014-06-301-3/+0
* | | | | | Merge "fs_msg: fix bad tmpfs detection (fix /persist mount errors)"JP Abgrall2014-06-301-1/+1
|\ \ \ \ \ \
| * | | | | | fs_msg: fix bad tmpfs detection (fix /persist mount errors)JP Abgrall2014-06-301-1/+1
* | | | | | | am 092954de: (-s ours) am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "C...Todd Poynor2014-06-300-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation...Todd Poynor2014-06-300-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO ...Todd Poynor2014-06-300-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Charger: Avoid animation while not charging DO NOT MERGE"Todd Poynor2014-06-301-11/+20
| | | |\ \ \
| | | | * | | Charger: Avoid animation while not charging DO NOT MERGEJenny TC2014-06-301-11/+20
| | | |/ / /
* | | | | | am 98569bc7: am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as nat...Narayan Kamath2014-06-306-6/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as native tests, no...Narayan Kamath2014-06-306-6/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables."Narayan Kamath2014-06-306-6/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Build pixelflinger tests as native tests, not executables."Narayan Kamath2014-06-266-6/+14
| | | |\ \ \
| | | | * | | Build pixelflinger tests as native tests, not executables.Narayan Kamath2014-06-266-6/+14
* | | | | | | am 3e906630: am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for...Ian Rogers2014-06-291-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-291-6/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-291-6/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-281-6/+6
| | | |\ \ \
| | | | * | | Rename __unused to __UNUSED for glibc support.Ian Rogers2014-06-271-6/+6
* | | | | | | am 36d04e37: am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetic...Mark Salyzyn2014-06-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"Mark Salyzyn2014-06-271-13/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"Mark Salyzyn2014-06-271-13/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "debuggerd: synchronize cosmetics to internal"Mark Salyzyn2014-06-271-13/+9
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | debuggerd: synchronize cosmetics to internalMark Salyzyn2014-06-271-13/+9
| | | |/ / /
* | | | | | am 7e3a492f: am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debugger...Elliott Hughes2014-06-271-5/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient o...Elliott Hughes2014-06-271-5/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output."Elliott Hughes2014-06-271-5/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fixed tid/pid mixup in debuggerd gdbclient output."Elliott Hughes2014-06-261-5/+5
| | | |\ \ \
| | | | * | | Fixed tid/pid mixup in debuggerd gdbclient output.Brigid Smith2014-06-271-5/+5
* | | | | | | resolved conflicts for merge of ab5b8603 to masterMark Salyzyn2014-06-271-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 44029223: am c8a7e34d: Merge "tombstone: log output header suppressed in c...Mark Salyzyn2014-06-271-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c8a7e34d: Merge "tombstone: log output header suppressed in crash"Mark Salyzyn2014-06-271-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "tombstone: log output header suppressed in crash"Mark Salyzyn2014-06-271-1/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | tombstone: log output header suppressed in crashMark Salyzyn2014-06-271-1/+1
| | | |/ / /
* | | | | | fs_mgr: increase tmpfs size to accommodate bigger dex2oat dataJP Abgrall2014-06-271-1/+1
* | | | | | resolved conflicts for merge of fa6f2543 to masterRiley Andrews2014-06-265-8/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-275-8/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 10f8cd1d: Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-275-8/+42
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-265-8/+42
| | | |\ \ \ | | | | |_|/ | | | |/| |