summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add gralloc usage conversion functions" into oc-devTreeHugger Robot2017-03-285-0/+331
|\
| * Add gralloc usage conversion functionsJesse Hall2017-03-285-0/+331
* | libcutils: remove sched_set/getschedulerWei Wang2017-03-281-19/+3
|/
* Merge "init: add class_restart" am: 8678872a00 am: ee7137208eSteven Moreland2017-03-272-1/+12
|\
| * Merge "init: add class_restart" am: 8678872a00Steven Moreland2017-03-272-1/+12
| |\
| | * Merge "init: add class_restart"Steven Moreland2017-03-272-1/+12
| | |\
| | | * Merge "init: add class_restart"Treehugger Robot2017-03-272-1/+12
| | | |\
| | | | * init: add class_restartSteven Moreland2017-03-272-1/+12
* | | | | Merge "debuggerd_client: properly wait for completion." am: 372d8a2931 am: 63...Josh Gao2017-03-273-16/+167
|\| | | |
| * | | | Merge "debuggerd_client: properly wait for completion." am: 372d8a2931Josh Gao2017-03-273-16/+167
| |\| | |
| | * | | Merge "debuggerd_client: properly wait for completion."Josh Gao2017-03-273-16/+167
| | |\| |
| | | * | Merge "debuggerd_client: properly wait for completion."Treehugger Robot2017-03-273-16/+167
| | | |\ \
| | | | * | debuggerd_client: properly wait for completion.Josh Gao2017-03-273-16/+167
* | | | | | Merge "init: remove superfluous forward definitions" am: deb23ba2c1 am: 256c8...Tom Cherry2017-03-271-3/+0
|\| | | | |
| * | | | | Merge "init: remove superfluous forward definitions" am: deb23ba2c1Tom Cherry2017-03-271-3/+0
| |\| | | |
| | * | | | Merge "init: remove superfluous forward definitions"Tom Cherry2017-03-271-3/+0
| | |\| | |
| | | * | | Merge "init: remove superfluous forward definitions"Treehugger Robot2017-03-271-3/+0
| | | |\ \ \
| | | | * | | init: remove superfluous forward definitionsTom Cherry2017-03-271-3/+0
* | | | | | | Merge "init: Fix README.md for writepid" am: 88d6b4af16 am: dc597affccTom Cherry2017-03-271-1/+1
|\| | | | | |
| * | | | | | Merge "init: Fix README.md for writepid" am: 88d6b4af16Tom Cherry2017-03-271-1/+1
| |\| | | | |
| | * | | | | Merge "init: Fix README.md for writepid"Tom Cherry2017-03-271-1/+1
| | |\| | | |
| | | * | | | Merge "init: Fix README.md for writepid"Treehugger Robot2017-03-271-1/+1
| | | |\ \ \ \
| | | | * | | | init: Fix README.md for writepidTom Cherry2017-03-271-1/+1
* | | | | | | | Merge "init: add support of multiple class names" am: 3c1568aa13 am: fd450bb95aWei Wang2017-03-273-36/+55
|\| | | | | | |
| * | | | | | | Merge "init: add support of multiple class names" am: 3c1568aa13Wei Wang2017-03-273-36/+55
| |\| | | | | |
| | * | | | | | Merge "init: add support of multiple class names"Wei Wang2017-03-273-36/+55
| | |\| | | | |
| | | * | | | | Merge "init: add support of multiple class names"Treehugger Robot2017-03-273-36/+55
| | | |\ \ \ \ \
| | | | * | | | | init: add support of multiple class namesWei Wang2017-03-273-36/+55
| | | | | |_|_|/ | | | | |/| | |
* | | | | | | | Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" a...Bowgo Tsai2017-03-271-1/+1
|\| | | | | | |
| * | | | | | | Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" a...Bowgo Tsai2017-03-271-1/+1
| |\| | | | | |
| | * | | | | | Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"Bowgo Tsai2017-03-271-1/+1
| | |\| | | | |
| | | * | | | | Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"Treehugger Robot2017-03-271-1/+1
| | | |\ \ \ \ \
| | | | * | | | | fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partitionBowgo Tsai2017-03-271-1/+1
* | | | | | | | | Merge "libcutils: remove schedgroup" am: 3d8911fbbe am: c0fc8e7b7bWei Wang2017-03-271-63/+16
|\| | | | | | | |
| * | | | | | | | Merge "libcutils: remove schedgroup" am: 3d8911fbbeWei Wang2017-03-271-63/+16
| |\| | | | | | |
| | * | | | | | | Merge "libcutils: remove schedgroup"Wei Wang2017-03-271-63/+16
| | |\| | | | | |
| | | * | | | | | Merge "libcutils: remove schedgroup"Treehugger Robot2017-03-271-63/+16
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | libcutils: remove schedgroupWei Wang2017-03-271-63/+16
| | | | | |/ / / | | | | |/| | |
* | | | | | | | Merge "logcat: test: run 256 simultaneous logcats" am: b15429c0ea am: 232b57c60bMark Salyzyn2017-03-271-0/+50
|\| | | | | | |
| * | | | | | | Merge "logcat: test: run 256 simultaneous logcats" am: b15429c0eaMark Salyzyn2017-03-271-0/+50
| |\| | | | | |
| | * | | | | | Merge "logcat: test: run 256 simultaneous logcats"Mark Salyzyn2017-03-271-0/+50
| | |\| | | | |
| | | * | | | | Merge "logcat: test: run 256 simultaneous logcats"Mark Salyzyn2017-03-271-0/+50
| | | |\ \ \ \ \
| | | | * | | | | logcat: test: run 256 simultaneous logcatsMark Salyzyn2017-03-271-0/+50
| | | | |/ / / /
* | | | | | | | Merge changes I96998c4b,I161bf03b am: dd0cd8d88f am: f17500474aMark Salyzyn2017-03-276-226/+241
|\| | | | | | |
| * | | | | | | Merge changes I96998c4b,I161bf03b am: dd0cd8d88fMark Salyzyn2017-03-276-226/+241
| |\| | | | | |
| | * | | | | | Merge changes I96998c4b,I161bf03bMark Salyzyn2017-03-276-226/+241
| | |\| | | | |
| | | * | | | | Merge changes I96998c4b,I161bf03bMark Salyzyn2017-03-276-226/+241
| | | |\ \ \ \ \
| | | | * | | | | logd: last iterator initialized incorrectlyMark Salyzyn2017-03-271-2/+2
| | | | * | | | | logd: ASAN cleansingMark Salyzyn2017-03-276-224/+239
* | | | | | | | | Merge "update shutdown sequence and use shutdown_timeout to cover all wait" a...Keun-young Park2017-03-271-19/+26
|\| | | | | | | |