summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f777655d: resolved conflicts for 6ee734cf to stage-aosp-masterSergio Giro2015-09-236-3/+172
|\
| * resolved conflicts for 6ee734cf to stage-aosp-masterSergio Giro2015-09-236-3/+172
| |\
| | * libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation di...Sergio Giro2015-09-236-3/+172
* | | am 742d0173: am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc...Brian Carlstrom2015-09-191-0/+2
|\ \ \
| * \ \ resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-191-0/+2
| |\ \ \
| | * \ \ resolved conflicts for cf676a86 to lmp-mr1-ub-devBrian Carlstrom2015-09-193-23/+139
| | |\ \ \
| | | * | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-093-23/+139
| | * | | | resolved conflicts for merge of 7c327194 to lmp-mr1-ub-devBart Sears2015-08-263-1/+87
| | |\| | |
| | | * | | libutils: fix overflow in SharedBuffer [DO NOT MERGE]Sergio Giro2015-08-253-1/+85
* | | | | | resolved conflicts for 32d86587 to mnc-dr-dev-plus-aospNarayan Kamath2015-09-084-23/+145
|\| | | | | | |_|_|/ / |/| | | |
| * | | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-024-23/+145
* | | | | am bfe32228: Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"Dan Willemsen2015-09-021-13/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove USE_MINGW/CYGWIN; Whitelist windows modulesDan Willemsen2015-09-021-13/+5
* | | | | am 2c58af52: Merge "VectorImpl.cpp: fix benign multiplication overflow"Nick Kralevich2015-08-281-1/+4
|\| | | |
| * | | | VectorImpl.cpp: fix benign multiplication overflowNick Kralevich2015-08-281-1/+4
* | | | | am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" in...Abhishek Arya2015-08-263-1/+88
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | libutils: fix overflow in SharedBuffer [DO NOT MERGE]Sergio Giro2015-08-253-1/+88
* | | | | am 7ec4c228: am e80ec0c5: Merge "libutils: Enable LOCAL_SANITIZE := integer"Nick Kralevich2015-08-241-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | libutils: Enable LOCAL_SANITIZE := integerNick Kralevich2015-08-241-0/+4
* | | | | am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"Nick Kralevich2015-08-242-0/+14
|\| | | |
| * | | | libutils: cleanups for -fsanitize=integerNick Kralevich2015-08-242-0/+14
| * | | | Merge "libutils: fix overflow in String8::allocFromUTF8"Sergio Giro2015-08-181-0/+3
| |\ \ \ \
| | * | | | libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-181-0/+3
* | | | | | am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17:...Abhishek Arya2015-08-211-0/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b:...Abhishek Arya2015-08-211-0/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile ...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 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 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mn...Sergio Giro2015-08-181-0/+3
|\| | | | | | |
| * | | | | | | libutils: fix overflow in String8::allocFromUTF8Sergio Giro2015-08-181-0/+3
* | | | | | | | am 77b9868a: am 6d814037: Merge "libutils: fix signed/unsigned comparison war...Nick Kralevich2015-08-173-21/+21
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | libutils: fix signed/unsigned comparison warningsNick Kralevich2015-08-173-21/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."Elliott Hughes2015-07-303-17/+10
|\| | | | | |
| * | | | | | Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."Elliott Hughes2015-07-303-17/+10
| |\ \ \ \ \ \
| | * | | | | | Use __ANDROID__ instead of HAVE_ANDROID_OS.Elliott Hughes2015-07-303-17/+10
* | | | | | | | am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."Elliott Hughes2015-07-301-1/+1
|\| | | | | | |
| * | | | | | | Use _WIN32 rather than HAVE_WINSOCK.Elliott Hughes2015-07-291-1/+1
| |/ / / / / /
* | | | | | | am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."Elliott Hughes2015-07-291-0/+1
|\| | | | | |
| * | | | | | Move libutils off AndroidConfig.h.Elliott Hughes2015-07-291-0/+1
* | | | | | | resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aospElliott Hughes2015-06-306-32/+35
|\| | | | | |
| * | | | | | Consistently use strerror in libutils.Elliott Hughes2015-06-306-29/+31
* | | | | | | am 3c90808d: am c1c7f457: Merge "Add a space before :=."Evgenii Stepanov2015-06-121-1/+1
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Add a space before :=.Evgenii Stepanov2015-06-121-1/+1
| |/ / / /
* | | | | Merge "Work around spurious epoll notifications." into mnc-devJeff Brown2015-05-291-0/+5
|\ \ \ \ \
| * | | | | Work around spurious epoll notifications.Jeff Brown2015-05-291-0/+5