summaryrefslogtreecommitdiffstats
Commit message (Collapse)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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23180694 Change-Id: I566a290334345f48013029534efef3e08e726e40
| | | * | | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ↵Jon Larimer2015-11-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours am: 2f1562eb10 am: 9f1b1caa78 * commit '9f1b1caa787fdb9f66f32eda38d46f1b4e75b209': Add macro to call event logger for errors. DO NOT MERGE
| | | | * | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ↵Jon Larimer2015-11-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours am: 2f1562eb10 * commit '2f1562eb10279531524f54ca7c129ead66ab3673': Add macro to call event logger for errors. DO NOT MERGE
| | | | | * | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ↵Jon Larimer2015-11-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours * commit '089ad5e98ab8a4b2d4ea00c6a88d61b963797c90': Add macro to call event logger for errors. DO NOT MERGE
| | | | | | * | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ↵Jon Larimer2015-11-110-0/+0
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb * commit '93a3871abbd16a3e0dee6ab8e7e87356620efeac': Add macro to call event logger for errors. DO NOT MERGE
| | | | | | | * | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev ↵Jon Larimer2015-11-110-0/+0
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5280061b56 am: 442a830e9b -s ours * commit '442a830e9b0415460749016394b3a71b9df2af13': Add macro to call event logger for errors. DO NOT MERGE
| | | | | | | | * | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-devJon Larimer2015-11-114-1/+493
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5280061b56 * commit '5280061b5668d87b99ff4f9ef883a3fed944bce4': Add macro to call event logger for errors. DO NOT MERGE
| | | | | | | | | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23180694 Change-Id: I566a290334345f48013029534efef3e08e726e40
| | | * | | | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into ↵Jon Larimer2015-11-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours am: a1da204980 am: 7755770ac9 * commit '7755770ac930c8a7bf14a140e92330cee382fd16': Add macro to call event logger for errors. DO NOT MERGE
| | | | * | | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into ↵Jon Larimer2015-11-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours am: a1da204980 * commit 'a1da204980891f9e59a41d7a41d510f3f05d34bf': Add macro to call event logger for errors. DO NOT MERGE
| | | | | * | | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into ↵Jon Larimer2015-11-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours * commit 'd0ed7943b8a2f3d0000391f18899c77566a0be1a': Add macro to call event logger for errors. DO NOT MERGE
| | | | | | * | | | | | | | | Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-devJon Larimer2015-11-110-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f84eef3fca -s ours * commit 'f84eef3fca156cd9a9f2f09f305a6fd6c898f14b': Add macro to call event logger for errors. DO NOT MERGE
| | | | | | | * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23180694 Change-Id: I566a290334345f48013029534efef3e08e726e40
| | | * | | | | | | | | | | | | Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7fJon Larimer2015-11-114-1/+494
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bc1ef58505 * commit 'bc1ef5850501c5694f262c3ab844df4cc4846bcc': Add macro to call event logger for errors.
| | | | * | | | | | | | | | | | Merge "Add macro to call event logger for errors." into mnc-devJon Larimer2015-11-114-1/+494
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d028c6fa7f * commit 'd028c6fa7fe135a3b454a1773ba59cafbba4b49e': Add macro to call event logger for errors.
| | | | | * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23180694 Change-Id: I566a290334345f48013029534efef3e08e726e40
| | | * | | | | | | | | | | | | | Merge "logd: pruning time horizon" into mnc-dr-devMark Salyzyn2015-11-041-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dfbe85ec8b * commit 'dfbe85ec8bc9fee87d7eb3378253bc7cf9890199': logd: pruning time horizon
| | | | * | | | | | | | | | | | | Merge "logd: pruning time horizon" into mnc-dr-devMark Salyzyn2015-11-041-1/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | logd: pruning time horizonMark Salyzyn2015-11-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Estimate a time horizon of ten fold for worst UID pruning Bug: 25453210 Bug: 24782000 Change-Id: I7118deb6d42531c68ed2ac2a59c57b0580b942cc
| | | * | | | | | | | | | | | | | | Remove __DATE__/__TIME__ from init and debuggerdDan Willemsen2015-11-032-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 36b24a4a20 * commit '36b24a4a20d7d1e9fee5ff14f21e9876e57db2ca': Remove __DATE__/__TIME__ from init and debuggerd
| | | | * | | | | | | | | | | | | | Remove __DATE__/__TIME__ from init and debuggerdDan Willemsen2015-10-302-2/+2
| | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping these means that every build has different init and debuggerd binaries, even if the source was the same. So OTAs that don't touch these sources would still need to update the binaries. Both of these messages are only informational, so can be safely removed. Bootchart already encodes build-specific information from the system properties. Bug: 24204119 Change-Id: I7ebd65a20a3e031e7528c9f741616e20b3cd7446 (cherry picked from commit 30622bbb209db187f6851e4cf0cdaa147c2fca9f)
| | | * | | | | | | | | | | | | | Fix incorrect check of descsz value. am: d917514bd6Christopher Ferris2015-10-291-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 69406d904a * commit '69406d904abffcfd5addf14dc96584f73ab04ff5': Fix incorrect check of descsz value.
| | | | * | | | | | | | | | | | | Fix incorrect check of descsz value.Christopher Ferris2015-10-291-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d917514bd6 * commit 'd917514bd6b270df431ea4e781a865764d406120': Fix incorrect check of descsz value.
| | | | | * | | | | | | | | | | | Fix incorrect check of descsz value.Christopher Ferris2015-10-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25187394 (cherry picked from commit 1fa55234d6773e09e3bb934419b5b6cc0df981c9) Change-Id: Idbc9071e8b2b25a062c4e94118808d6e19d443d9
| | | * | | | | | | | | | | | | | Merge "Don\'t show UI on default encryption" into mnc-dr-devPaul Lawrence2015-10-211-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2b216aa89b * commit '2b216aa89b76dbadb315322e4fd31aa37059b262': Don't show UI on default encryption
| | | * | | | | | | | | | | | | | Reorder init.rc to avoid a kernel warning.Tim Murray2015-10-201-9/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f429d37807 * commit 'f429d37807a005c1de38a7616669bf1834d45432': Reorder init.rc to avoid a kernel warning.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with ↵Ruchi Kandoi2015-10-122-1/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no battery." into mnc-dr-dev * commit '08cf0e55a7c7e968d5f500d1ba01b9665077f0d4': healthd: Adds fake battery properties for devices with no battery.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ae302af: fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-241-7/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ae302af7d0f72559ffb8dd521f290b02fed3072': fs_mgr: trigger dm-verity error handling for invalid signatures
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a3f45684: Merge "add system-background cpuset" into mnc-dr-devTim Murray2015-09-211-0/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3f45684bda7b3a479e480ccb90cc745f8852efd': add system-background cpuset
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7fc499bb: am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: ↵Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. * commit '7fc499bb7c060d2382517b4d0688a8c76198c0a8': Follow up to change b638126ed DO NOT MERGE.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 222a1562: am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am ↵Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev * commit '222a15622a63d11783bbc998c2c261adb3ad1bd1': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-201-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '661600dd0f0bf48289f69915c6b9844436702a90': libutils: Fix integer overflows in VectorImpl.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 93807d47: Merge "logd: worst uid record watermark part five" into mnc-dr-devMark Salyzyn2015-09-141-4/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93807d472d7c3745cae539af881aefbf5e211d5f': logd: worst uid record watermark part five
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 805ef688: logd: klogd and MediatekMark Salyzyn2015-09-112-16/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '805ef688af4035ac45e79428a1b6328bd0b465d2': logd: klogd and Mediatek
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a6c377b2: init: usb: Add configfs commands for USB gadgetBadhri Jagan Sridharan2015-09-101-16/+134
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6c377b2f62175d6d5268c63885de3d882edbe2b': init: usb: Add configfs commands for USB gadget
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cdf094f6: am c609c31f: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0818-2191/+155
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdf094f667a251ddb03f95a4aa099e3acdaf9c4d': libutils: Fix integer overflows in VectorImpl.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f1833245: Merge "logd: worst uid record watermark part four" into mnc-dr-devMark Salyzyn2015-09-042-9/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1833245e9a77aae9320af90c18d41aec9c42718': logd: worst uid record watermark part four
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-devVincent Palatin2015-09-041-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e29490203c1f83fbdb4bbc68227ab5b7cc14681': init.usb.rc: fix USB typec property names
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d9a06afb: Add a logging handler on timeout.Christopher Ferris2015-09-041-1/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9a06afb19156b61ee85c975a292d884bba09c7f': Add a logging handler on timeout.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bc8c731a: Add zygote to the foreground cpuset.Tim Murray2015-09-024-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc8c731aab0fce447e2b792f443aa5b6d72f55f2': Add zygote to the foreground cpuset.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property ↵Tom Cherry2015-09-021-24/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triggers" into mnc-dr-dev * commit '68df4bd08bfb550456cc8edb19fa894a124db38c': DO NOT MERGE init: Fix parsing of multiple property triggers
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e1801863: init: usb: Add init scripts for configfs commandsBadhri Jagan Sridharan2015-09-012-0/+58
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e18018639bd38e959118d16d567c7567bb88d80b': init: usb: Add init scripts for configfs commands
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 48d59acc: init.usb.rc: Add new system property for configfsBadhri Jagan Sridharan2015-09-011-8/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48d59acc57701dce66113544ccf2a711e21fb1f4': init.usb.rc: Add new system property for configfs
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-devTim Murray2015-09-011-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a1f02eaa3e35ac2d975a2e632880ac26daff3bb': Add foreground/boost cpuset.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mnc-ub-dev' of ↵Nick Kralevich2015-09-011-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/system/core into mnc-ub-dev
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Backport missing null check in "adb get-state"." into mnc-ub-devElliott Hughes2015-09-011-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \