summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved confli...Narayan Kamath2015-09-200-0/+0
|\
| * am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b6381...Narayan Kamath2015-09-170-0/+0
| |\
| | * am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-mo...Narayan Kamath2015-09-120-0/+0
| | |\
| | | * am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-120-0/+0
| | | |\
| | | | * resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-1018-2188/+155
| | | | |\
| | | | | * libutils: Fix integer overflows in VectorImpl. DO NOT MERGENarayan Kamath2015-09-0918-2188/+154
* | | | | | resolved conflicts for cf676a86 to lmp-mr1-ub-devBrian Carlstrom2015-09-1917-2191/+149
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-1717-2190/+148
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 419e6c3c: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-1217-2190/+148
| | |\ \ \ \ | | | |/ / /
| | | * | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0917-2190/+148
* | | | | | resolved conflicts for merge of 7c327194 to lmp-mr1-ub-devBart Sears2015-08-263-1/+87
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1dda45c7: am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE]Sergio Giro2015-08-253-1/+85
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE]Sergio Giro2015-08-253-1/+85
| | |\ \ \ \ | | | |/ / /
| | | * | | libutils: fix overflow in SharedBuffer [DO NOT MERGE]Sergio Giro2015-08-253-1/+85
* | | | | | am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [D...Sergio Giro2015-08-250-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] ...Sergio Giro2015-08-250-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix...Sergio Giro2015-08-250-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in ...Sergio Giro2015-08-250-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBufferSergio Giro2015-08-253-1/+85
| | | | |\ \ | | | | | |/
| | | | | * [DO NOT MERGE] libutils: fix overflow in SharedBufferSergio Giro2015-08-213-1/+85
* | | | | | am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile ...Abhishek Arya2015-08-211-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after...Abhishek Arya2015-08-211-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc07910...Abhishek Arya2015-08-211-0/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea68...Abhishek Arya2015-08-211-0/+3
| | | |\ \ \ | | | | |/ /
| | | | * | am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d3197...Abhishek Arya2015-08-211-0/+3
| | | | |\ \ | | | | | |/
| | | | | * Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1bAbhishek Arya2015-08-201-0/+3
* | | | | | am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fi...Sergio Giro2015-08-201-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in...Sergio Giro2015-08-201-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::all...Sergio Giro2015-08-201-0/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-201-0/+3
| | | |\ \ \ | | | | |/ /
| | | | * | am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-201-0/+3
| | | | |\ \ | | | | | |/
| | | | | * libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-181-0/+3
* | | | | | am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmergeAdam Lesinski2015-05-281-2/+8
|\ \ \ \ \ \
| * \ \ \ \ \ am 1def25a2: Merge commit \'7ac60686\' into manualmergeAdam Lesinski2015-05-281-2/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge commit '7ac60686' into manualmergeAdam Lesinski2015-05-271-2/+8
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 058ad0b6: am e8582d65: am 9bd7afc0: Prevent integer overflow when allocati...Adam Lesinski2015-05-271-5/+13
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_han...Adam Lesinski2015-05-271-5/+13
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am 9bd7afc0: Prevent integer overflow when allocating native_handle_tAdam Lesinski2015-05-271-5/+13
| | | | | |\ \ | | | | | | |/
| | | | | | * Prevent integer overflow when allocating native_handle_tAdam Lesinski2015-05-271-5/+13
* | | | | | | am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified a...Iliyan Malchev2015-05-121-1/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage ...Iliyan Malchev2015-05-121-1/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "fs_mgr: allow for zramsize to be specified as percentage of total memo...Iliyan Malchev2015-05-121-1/+21
| | |\ \ \ \ \
| | | * | | | | fs_mgr: allow for zramsize to be specified as percentage of total memoryIliyan Malchev2015-05-011-1/+21
* | | | | | | | resolved conflicts for merge of b67b92f2 to lmp-mr1-ub-devChristopher Ferris2015-05-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Do not dump maps/memory/code of sibling threads. DO NOT MERGEChristopher Ferris2015-05-071-43/+39
| |/ / / / / /
* | | | | | | am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"Nick Kralevich2015-04-263-43/+48
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 9c9280d8: Merge "init: get rid of the remaining double mounts"Nick Kralevich2015-04-263-43/+48
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "init: get rid of the remaining double mounts"Nick Kralevich2015-04-263-43/+48
| | |\ \ \ \ \ \ \
| | | * | | | | | | init: get rid of the remaining double mountsNick Kralevich2015-04-253-43/+48
| | |/ / / / / / /
* | | | | | | | | am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"Nick Kralevich2015-04-261-14/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /