summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am caed3d9f: Merge "notify: dynamically allocate filename buffer"Elliott Hughes2014-11-211-4/+8
|\
| * Merge "notify: dynamically allocate filename buffer"Elliott Hughes2014-11-211-4/+8
| |\
| | * notify: dynamically allocate filename bufferJohan Redestig2014-11-201-4/+8
* | | resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aospElliott Hughes2014-11-214-415/+0
|\ \ \ | |/ /
| * | Merge "Remove the adb usb vendor id whitelist."Elliott Hughes2014-11-214-412/+0
| |\ \
| | * | Remove the adb usb vendor id whitelist.Elliott Hughes2014-11-214-412/+0
| |/ /
* | | am 97e1e170: Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
|\ \ \ | |/ /
| * | Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
| |\ \
| | * | Disable vendor id filtering for OS X.Al Sutton2014-11-211-56/+37
* | | | am 0750f786: Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-212-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-212-2/+2
| |\ \ \
| | * | | Remove explict use of ASCII encodingAl Sutton2014-11-212-2/+2
| | |/ /
* | | | am 01d49e85: Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
|\ \ \ \ | |/ / /
| * | | Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
| |\ \ \
| | * | | adb: Add USB vendor ID for Ubiquiti Networks, Inc.Jeremy Chang2014-11-191-0/+3
* | | | | am 84babf39: Merge "Fix format string"Chih-Hung Hsieh2014-11-211-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix format string"Chih-Hung Hsieh2014-11-211-3/+4
| |\ \ \ \
| | * | | | Fix format stringChih-Hung Hsieh2014-11-201-3/+4
| |/ / / /
* | | | | am 07148ea2: Merge "Make mkdirAndChown do what it claims to do"Chih-hung Hsieh2014-11-211-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Make mkdirAndChown do what it claims to do"Chih-hung Hsieh2014-11-211-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Make mkdirAndChown do what it claims to doBernhard Rosenkränzer2014-11-171-2/+2
* | | | | am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
| |\ \ \ \
| | * | | | Add a pre-C++11 constexpr compatibility macro.Dan Albert2014-11-201-0/+11
* | | | | | am aa3e17e1: Merge "Return path including executable instead of without"Elliott Hughes2014-11-202-10/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Return path including executable instead of without"Elliott Hughes2014-11-202-10/+10
| |\ \ \ \ \
| | * | | | | Return path including executable instead of withoutAl Sutton2014-11-202-10/+10
| | | |_|_|/ | | |/| | |
* | | | | | am 51184950: Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Disable vendor id filtering for Linux.Elliott Hughes2014-11-192-20/+4
| |/ / / /
* | | | | am 46ee85fc: Merge "kill HAVE_PREAD"Yabin Cui2014-11-201-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "kill HAVE_PREAD"Yabin Cui2014-11-201-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | kill HAVE_PREADYabin Cui2014-11-191-2/+2
| |/ / /
* | | | logd: throttle SELinux denials to 20/secNick Kralevich2014-11-190-0/+0
|\ \ \ \
| * | | | logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
* | | | | am 606bb5f2: Merge "logd: throttle SELinux denials to 20/sec"Nick Kralevich2014-11-193-22/+13
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "logd: throttle SELinux denials to 20/sec"Nick Kralevich2014-11-193-22/+13
| |\ \ \ \
| | * | | | logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
| | | |_|/ | | |/| |
* | | | | am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-192-15/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-192-15/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-192-15/+16
| |/ / /
* | | | am 81906d4b: Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+6
|\ \ \ \ | |/ / /
| * | | Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+6
| |\ \ \
| | * | | kill HAVE_MADVISEYabin Cui2014-11-191-2/+6
| |/ / /
* | | | am c8ad1809: Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+2
| |\ \ \
| | * | | kill HAVE_MADVISEYabin Cui2014-11-181-2/+2
| |/ / /
* | | | am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\ \ \ \ | |/ / /
| * | | Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
| |\ \ \
| | * | | Revert "adb: Add USB vendor ID for Honeywell"Elliott Hughes2014-11-181-3/+0