summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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 e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d3197...Abhishek Arya2015-08-211-0/+3
|\ \ | |/
| * Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1bAbhishek Arya2015-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 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
* | DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-06-181-1/+1
* | Log stack even if tombstone cannot be created.Christopher Ferris2014-05-091-8/+15
* | Document the adb install -d option.Jeff Brown2014-04-151-1/+2
* | rootdir: reduce permissions on /dev/rtc0Greg Hackmann2014-03-311-1/+1
* | Add BitSet64. DO NOT MERGEMichael Wright2014-03-242-26/+360
* | am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60JP Abgrall2014-03-141-1/+10
|\ \ | |/
| * init.rc: prep tcp_default_init_rwnd, set the default to 60JP Abgrall2014-03-131-1/+10
* | fastboot: allow format on devices with small buffersDmitry Grinberg2014-03-136-209/+149
* | am 726beb6c: am 6941a83c: don\'t load property_contexts from /dataNick Kralevich2014-03-040-0/+0
|\ \
| * \ am 6941a83c: don\'t load property_contexts from /dataNick Kralevich2014-03-040-0/+0
| |\ \ | | |/
| | * don't load property_contexts from /dataNick Kralevich2014-03-041-1/+0
* | | Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc f...Daniel Cashman2014-03-041-1/+5
|\ \ \
| * | | Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.Stephen Smalley2014-02-281-1/+5
* | | | am 3530b9cd: am 02916aa2: Remove obsolete vdc call.Nick Kralevich2014-03-040-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 02916aa2: Remove obsolete vdc call.Nick Kralevich2014-03-042-16/+2
| |\ \ | | |/
| | * Remove obsolete vdc call.Nick Kralevich2014-03-042-16/+2
* | | am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local va...Christopher Ferris2014-01-291-3/+3
|\ \ \
| * \ \ am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."Christopher Ferris2014-01-291-3/+3
| |\ \ \ | | |/ /
| | * | am a152ed73: Merge "Fix global pointing to local variable."Christopher Ferris2014-01-291-3/+3
| | |\ \
| | | * \ Merge "Fix global pointing to local variable."Christopher Ferris2014-01-291-3/+3
| | | |\ \
| | | | * | Fix global pointing to local variable.Christopher Ferris2014-01-281-3/+3
| | | |/ /
* | | | | am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in t...Kristian Monsen2014-01-281-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"Kristian Monsen2014-01-281-2/+2
| |\ \ \ \ | | |/ / /
| | * | | am 6e34793b: Merge "Fix code style, put unused in the end"Kristian Monsen2014-01-281-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge "Fix code style, put unused in the end"Kristian Monsen2014-01-281-2/+2
| | | |\ \
| | | | * | Fix code style, put unused in the endKristian Monsen2014-01-281-2/+2
* | | | | | am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d391c9b4: Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Re-enable libunwind for arm."Christopher Ferris2014-01-2818-120/+298
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Re-enable libunwind for arm.Christopher Ferris2014-01-2818-120/+298
* | | | | | am 7b9bb36a: am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c...Mark Salyzyn2014-01-2840-576/+2974
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I776509...Mark Salyzyn2014-01-2840-576/+2974
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee,...Mark Salyzyn2014-01-2840-576/+2974
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...Mark Salyzyn2014-01-2840-576/+2974
| | | |\ \ \
| | | | * | | libsysutils: SocketListener export releaseMark Salyzyn2014-01-272-26/+53
| | | | * | | libsysutils: Add iovec/runOnEachSocketMark Salyzyn2014-01-275-36/+137
| | | | * | | liblog: support struct logger_event_v2 formatMark Salyzyn2014-01-271-6/+15
| | | | * | | liblog: update timestamp on NOTICE fileMark Salyzyn2014-01-271-1/+1
| | | | * | | libcutils: resolve warning in iosched_policy.cMark Salyzyn2014-01-271-3/+6