summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-0911-25/+287
|\
| * Merge "Enable verity on userdebug, and add disable-verity to adb" into lmp-mr...Paul Lawrence2014-10-0811-24/+286
| |\
| | * Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-0811-24/+286
* | | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
|\ \ \
| * \ \ am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| |\ \ \
| | * \ \ Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| | |\ \ \
| | | * | | fs_mgr: fix build breakageMark Salyzyn2014-10-081-0/+1
| | |/ / /
* | | | | am 33b33549: Merge "Make the default cgroup, the foreground cgroup." into lmp...Riley Andrews2014-10-082-38/+11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-devRiley Andrews2014-10-082-38/+11
| |\ \ \ \
| | * | | | Make the default cgroup, the foreground cgroup.Riley Andrews2014-10-072-38/+11
* | | | | | am 2c05b4fe: Fix top for very large VSS.Elliott Hughes2014-10-080-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
| | |_|_|/ | |/| | |
* | | | | am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
| | |\ \ \
| | | * | | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
| | |/ / /
* | | | | am 525db43b: am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." ...Christopher Ferris2014-10-081-9/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-081-9/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | am 3fe9adc9: Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-081-9/+9
| | |\ \ \
| | | * \ \ Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-071-9/+9
| | | |\ \ \
| | | | * | | Fix write past end of memory.Christopher Ferris2014-10-071-9/+9
* | | | | | | am af162c8b: am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Re...Christopher Ferris2014-10-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcork...Christopher Ferris2014-10-070-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-070-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-070-0/+0
| | | |\ \ \ \
| | | | * | | | DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-06-181-1/+1
* | | | | | | | am 05c32e75: am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even ...Christopher Ferris2014-10-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone ...Christopher Ferris2014-10-070-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be cre...Christopher Ferris2014-10-070-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 290efd24: (-s ours) Log stack even if tombstone cannot be created.Christopher Ferris2014-10-070-0/+0
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Log stack even if tombstone cannot be created.Christopher Ferris2014-05-091-8/+15
* | | | | | | | am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for F...Carson Liao2014-10-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM featureCarson Liao2014-10-071-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | modified AUDIO_SOURCE_FM_TUNER enum value for FM featureCarson Liao2014-10-061-1/+1
* | | | | | | | am b2a5d839: am a083c857: Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | am a083c857: Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
| | |\ \ \ \ \ \
| | | * | | | | | logd: LogStatistics leakMark Salyzyn2014-10-061-0/+4
| | | * | | | | | logd: kill(0,0) issueMark Salyzyn2014-10-061-1/+6
| | |/ / / / / /
* | | | | | | | am 332bdffa: am 09dc0633: Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 09dc0633: Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
| | |\ \ \ \ \ \
| | | * | | | | | logd: Add control statistics enable/disable.Mark Salyzyn2014-10-065-14/+42
| | | * | | | | | logd: cleanupMark Salyzyn2014-10-064-56/+56
| | |/ / / / / /
* | | | | | | | am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 4fceda2b: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
| | |\ \ \ \ \ \
| | | * | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-065-0/+18
| | |/ / / / / /
* | | | | | | | am 67479c97: am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio grou...Mike Lockwood2014-10-061-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can p...Mike Lockwood2014-10-061-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |