summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"Mark Salyzyn2015-01-242-16/+42
|\
| * am 4730328d: Merge "logd: create private/android_logger.h"Mark Salyzyn2015-01-232-16/+42
| |\
| | * Merge "logd: create private/android_logger.h"Mark Salyzyn2015-01-232-16/+42
| | |\
| | | * logd: create private/android_logger.hMark Salyzyn2015-01-232-16/+42
| | |/
* | | am 8e65c371: am 2c7f05d8: Merge "Remove unused -ldl to link true statically."Chih-Hung Hsieh2015-01-241-1/+0
|\ \ \ | |/ /
| * | am 2c7f05d8: Merge "Remove unused -ldl to link true statically."Chih-Hung Hsieh2015-01-231-1/+0
| |\ \ | | |/
| | * Merge "Remove unused -ldl to link true statically."Chih-Hung Hsieh2015-01-231-1/+0
| | |\
| | | * Remove unused -ldl to link true statically.Chih-Hung Hsieh2015-01-231-1/+0
* | | | Merge "camera: add external camera facing enum"Zhijun He2015-01-231-1/+6
|\ \ \ \
| * | | | camera: add external camera facing enumZhijun He2015-01-221-1/+6
* | | | | am 0944e305: am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"Elliott Hughes2015-01-231-0/+91
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"Elliott Hughes2015-01-231-0/+91
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "fs_mgr: Support filesystem labels in fstab"Elliott Hughes2015-01-231-0/+91
| | |\ \ \
| | | * | | fs_mgr: Support filesystem labels in fstabChristoffer Dall2015-01-231-0/+91
| | |/ / /
* | | | | am 320ead2a: am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."David 'Digit' Turner2015-01-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."David 'Digit' Turner2015-01-231-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "adb: Fix 'adb forward --no-rebind'."David 'Digit' Turner2015-01-231-1/+1
| | |\ \ \
| | | * | | adb: Fix 'adb forward --no-rebind'.David 'Digit' Turner2015-01-231-1/+1
* | | | | | am 1fdd4dc0: am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in...Elliott Hughes2015-01-231-91/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""Elliott Hughes2015-01-231-91/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Revert "fs_mgr: Support filesystem labels in fstab""Elliott Hughes2015-01-231-91/+0
| | |\ \ \ \
| | | * | | | Revert "fs_mgr: Support filesystem labels in fstab"Elliott Hughes2015-01-231-91/+0
* | | | | | | am 253b9cfb: am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-231-0/+91
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-231-0/+91
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-221-0/+91
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | fs_mgr: Support filesystem labels in fstabChristoffer Dall2015-01-171-0/+91
* | | | | | am 6f355d2c: am 045be135: Merge "liblog: logcat color output corrupted on 32-...Mark Salyzyn2015-01-221-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"Mark Salyzyn2015-01-221-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "liblog: logcat color output corrupted on 32-bit"Mark Salyzyn2015-01-221-1/+1
| | |\ \ \ \
| | | * | | | liblog: logcat color output corrupted on 32-bitMark Salyzyn2015-01-221-1/+1
| | |/ / / /
* | | | | | am bd3bbff6: am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."Christopher Ferris2015-01-224-82/+129
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."Christopher Ferris2015-01-224-82/+129
| |\ \ \ \ | | |/ / /
| | * | | Merge "Move 32 bit/64 bit check into debuggerd."Christopher Ferris2015-01-214-82/+129
| | |\ \ \
| | | * | | Move 32 bit/64 bit check into debuggerd.Christopher Ferris2015-01-204-82/+129
* | | | | | am f8eac2ff: am ce34551c: Merge "Lose id to toybox."Elliott Hughes2015-01-172-58/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ce34551c: Merge "Lose id to toybox."Elliott Hughes2015-01-172-58/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Lose id to toybox."Elliott Hughes2015-01-172-58/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Lose id to toybox.Elliott Hughes2015-01-162-58/+0
| | |/ / /
* | | | | am bb604524: am 45c4c06f: Merge "Remove unused cruft from libcutils."Elliott Hughes2015-01-163-117/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 45c4c06f: Merge "Remove unused cruft from libcutils."Elliott Hughes2015-01-163-117/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Remove unused cruft from libcutils."Elliott Hughes2015-01-163-117/+0
| | |\ \ \
| | | * | | Remove unused cruft from libcutils.Elliott Hughes2015-01-153-117/+0
| | |/ / /
* | | | | am 7c42c7f8: am 9f72ef89: Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-168-19/+86
|\ \ \ \ \ | |/ / / /
| * | | | am 9f72ef89: Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-168-19/+86
| |\ \ \ \ | | |/ / /
| | * | | Merge "Extend to receive NFLOG packets."Jeff Sharkey2015-01-168-19/+86
| | |\ \ \
| | | * | | Extend to receive NFLOG packets.Jeff Sharkey2015-01-158-19/+86
* | | | | | am f5a6c6bb: am 17e2f436: Merge "Lose cmp to toybox."Elliott Hughes2015-01-162-92/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 17e2f436: Merge "Lose cmp to toybox."Elliott Hughes2015-01-152-92/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Lose cmp to toybox."Elliott Hughes2015-01-152-92/+0
| | |\ \ \ \
| | | * | | | Lose cmp to toybox.Elliott Hughes2015-01-152-92/+0