summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bod...Chih-Hung Hsieh2014-10-152-39/+68
|\
| * am 7979f1ce: Merge "Do not inline rarely used trace function bodies."Chih-Hung Hsieh2014-10-152-39/+68
| |\
| | * Merge "Do not inline rarely used trace function bodies."Chih-Hung Hsieh2014-10-152-39/+68
| | |\
| | | * Do not inline rarely used trace function bodies.Chih-Hung Hsieh2014-10-142-39/+68
* | | | am 4f083c61: am a8aad166: Merge "logd: insert order for first entry"Mark Salyzyn2014-10-151-1/+2
|\ \ \ \ | |/ / /
| * | | am a8aad166: Merge "logd: insert order for first entry"Mark Salyzyn2014-10-151-1/+2
| |\ \ \ | | |/ /
| | * | Merge "logd: insert order for first entry"Mark Salyzyn2014-10-141-1/+2
| | |\ \ | | | |/ | | |/|
| | | * logd: insert order for first entryMark Salyzyn2014-10-141-1/+2
| | |/
* | | am 00ffc22c: am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: R...Dianne Hackborn2014-10-142-5/+29
|\ \ \
| * \ \ am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restar...Dianne Hackborn2014-10-142-5/+29
| |\ \ \
| | * \ \ am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restart while scrol...Dianne Hackborn2014-10-142-5/+29
| | |\ \ \
| | | * | | Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling InstagramDianne Hackborn2014-10-132-5/+29
* | | | | | resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aospDmitriy Ivanov2014-10-141-1/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am e63fb8bd: Merge "Remove libsigchain from LD_PRELOADs"Dmitriy Ivanov2014-10-141-1/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Remove libsigchain from LD_PRELOADs"Dmitriy Ivanov2014-10-141-1/+0
| | |\ \ \ \
| | | * | | | Remove libsigchain from LD_PRELOADsDmitriy Ivanov2014-10-071-1/+0
* | | | | | | am e7502d32: am 3bcd5694: Merge "Add gtest conformance tests for libsync."Riley Andrews2014-10-110-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3bcd5694: Merge "Add gtest conformance tests for libsync."Riley Andrews2014-10-112-0/+646
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Add gtest conformance tests for libsync."Riley Andrews2014-10-112-0/+646
| | |\ \ \ \ \
| | | * | | | | Add gtest conformance tests for libsync.Riley Andrews2014-10-112-0/+646
| | |/ / / / /
* | | | | | | am 86b4dba9: am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-111-1/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-111-1/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-111-1/+3
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
* | | | | | | am 97e48731: Fix Nick\'s nitsPaul Lawrence2014-10-101-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix Nick's nitsPaul Lawrence2014-10-091-4/+4
* | | | | | | resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-1011-32/+306
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-0911-32/+306
* | | | | | | resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-0911-286/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Revert "Enable verity on userdebug, and add disable-verity to adb"" in...Nick Kralevich2014-10-0811-286/+24
| |\ \ \ \ \ \
| | * | | | | | Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-0811-286/+24
* | | | | | | | am fd4f05ce: Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5,...Mark Salyzyn2014-10-090-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5, ... into lmp...Mark Salyzyn2014-10-087-79/+130
| |\ \ \ \ \ \ \
| | * | | | | | | logd: kill(0,0) issueMark Salyzyn2014-10-081-1/+6
| | * | | | | | | logd: LogStatistics leakMark Salyzyn2014-10-081-0/+4
| | * | | | | | | logd: Add control statistics enable/disable.Mark Salyzyn2014-10-085-14/+42
| | * | | | | | | logd: cleanupMark Salyzyn2014-10-084-56/+56
| | * | | | | | | logd: auditd: report facility LOG_AUTHMark Salyzyn2014-10-081-4/+15
| | * | | | | | | logd: auditd: kmsg priorityMark Salyzyn2014-10-081-9/+12
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /