summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | * | Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-devJon Larimer2015-11-113-1/+98
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | Add macro to call event logger for errors. DO NOT MERGEWilliam Luh2015-11-103-1/+98
| | | * | | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ...Jon Larimer2015-11-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ...Jon Larimer2015-11-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ...Jon Larimer2015-11-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ...Jon Larimer2015-11-110-0/+0
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ...Jon Larimer2015-11-110-0/+0
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / /
| | | | | | | | * | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-devJon Larimer2015-11-114-1/+493
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / /
| | | | | | | | | * | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-devJon Larimer2015-11-114-1/+493
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | Add macro to call event logger for errors. DO NOT MERGEWilliam Luh2015-11-104-1/+493
| | | * | | | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-...Jon Larimer2015-11-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-...Jon Larimer2015-11-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-...Jon Larimer2015-11-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-devJon Larimer2015-11-110-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / /
| | | | | | | * | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-devJon Larimer2015-11-114-1/+493
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | Add macro to call event logger for errors. DO NOT MERGEWilliam Luh2015-11-104-1/+493
| | | * | | | | | | | | | | | | Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7fJon Larimer2015-11-114-1/+494
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge "Add macro to call event logger for errors." into mnc-devJon Larimer2015-11-114-1/+494
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | Merge "Add macro to call event logger for errors." into mnc-devJon Larimer2015-11-114-1/+494
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Add macro to call event logger for errors.William Luh2015-11-104-1/+494
| | | * | | | | | | | | | | | | | Merge "logd: pruning time horizon" into mnc-dr-devMark Salyzyn2015-11-041-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | Merge "logd: pruning time horizon" into mnc-dr-devMark Salyzyn2015-11-041-1/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | logd: pruning time horizonMark Salyzyn2015-11-031-1/+4
| | | * | | | | | | | | | | | | | | Remove __DATE__/__TIME__ from init and debuggerdDan Willemsen2015-11-032-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Remove __DATE__/__TIME__ from init and debuggerdDan Willemsen2015-10-302-2/+2
| | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Fix incorrect check of descsz value. am: d917514bd6Christopher Ferris2015-10-291-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | Fix incorrect check of descsz value.Christopher Ferris2015-10-291-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | Fix incorrect check of descsz value.Christopher Ferris2015-10-221-4/+4
| | | * | | | | | | | | | | | | | Merge "Don\'t show UI on default encryption" into mnc-dr-devPaul Lawrence2015-10-211-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Reorder init.rc to avoid a kernel warning.Tim Murray2015-10-201-9/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with no...Ruchi Kandoi2015-10-122-1/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ae302af: fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-241-7/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a3f45684: Merge "add system-background cpuset" into mnc-dr-devTim Murray2015-09-211-0/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7fc499bb: am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am...Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 222a1562: am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959:...Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-201-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 93807d47: Merge "logd: worst uid record watermark part five" into mnc-dr-devMark Salyzyn2015-09-141-4/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 805ef688: logd: klogd and MediatekMark Salyzyn2015-09-112-16/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a6c377b2: init: usb: Add configfs commands for USB gadgetBadhri Jagan Sridharan2015-09-101-16/+134
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cdf094f6: am c609c31f: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0818-2191/+155
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f1833245: Merge "logd: worst uid record watermark part four" into mnc-dr-devMark Salyzyn2015-09-042-9/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-devVincent Palatin2015-09-041-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d9a06afb: Add a logging handler on timeout.Christopher Ferris2015-09-041-1/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bc8c731a: Add zygote to the foreground cpuset.Tim Murray2015-09-024-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property trigg...Tom Cherry2015-09-021-24/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e1801863: init: usb: Add init scripts for configfs commandsBadhri Jagan Sridharan2015-09-012-0/+58
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 48d59acc: init.usb.rc: Add new system property for configfsBadhri Jagan Sridharan2015-09-011-8/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-devTim Murray2015-09-011-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_dir...Nick Kralevich2015-09-011-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Backport missing null check in "adb get-state"." into mnc-ub-devElliott Hughes2015-09-011-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \