summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
| | | |\ \ \
| | | | * | | init: remove obsolete rle logoMarcin Chojnacki2013-10-164-190/+21
| | | |/ / /
* | | | | | am 536dea9d: am 169c12b5: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 169c12b5: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | |\ \ \
| | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | |\ \ \
* | | | | | | | \ \ \ am aa4051dc: am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive buil...Nick Kralevich2013-10-104-3/+24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive built-in command ...Nick Kralevich2013-10-104-3/+24
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | am a94d2b39: Merge "Add a restorecon_recursive built-in command to init."Nick Kralevich2013-10-104-3/+24
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge "Add a restorecon_recursive built-in command to init."Nick Kralevich2013-10-104-3/+24
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add a restorecon_recursive built-in command to init.Stephen Smalley2013-10-104-3/+24
* | | | | | | | | | | | am 33d1e629: am 4ff9c3f7: am aab1670b: Merge "Add support for ECDSA P-256 wit...Kenny Root2013-10-1016-34/+2580
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 4ff9c3f7: am aab1670b: Merge "Add support for ECDSA P-256 with SHA256"Kenny Root2013-10-1016-34/+2580
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am aab1670b: Merge "Add support for ECDSA P-256 with SHA256"Kenny Root2013-10-1016-34/+2580
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Add support for ECDSA P-256 with SHA256"Kenny Root2013-10-1016-34/+2580
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add support for ECDSA P-256 with SHA256Kenny Root2013-10-0916-34/+2580
| | | | |/ / / / / / / /
* | | | | | | | | | | | am 6891df7a: am 45ddf184: am 9b8a929d: Merge "libcutils doesn\'t need to be l...Elliott Hughes2013-10-101-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 45ddf184: am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bio...Elliott Hughes2013-10-101-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bionic\'s privat...Elliott Hughes2013-10-101-5/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "libcutils doesn't need to be looking at bionic's privates."Elliott Hughes2013-10-101-5/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | libcutils doesn't need to be looking at bionic's privates.Elliott Hughes2013-10-101-5/+0
| | | |/ / / / / / / / /
* | | | | | | | | | | | am 7f7b12b8: am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset ve...Elliott Hughes2013-10-103-21/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset versions"Elliott Hughes2013-10-103-21/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am be18538d: Merge "Cleanup x86 flags and memset versions"Elliott Hughes2013-10-103-21/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Cleanup x86 flags and memset versions"Elliott Hughes2013-10-103-21/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Cleanup x86 flags and memset versionsPavel Chupin2013-10-103-21/+2
| | | |/ / / / / / / / /
* | | | | | | | | | | | am f84f7fa4: am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message proces...Christopher Ferris2013-10-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."Christopher Ferris2013-10-091-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 2de8102d: Merge "Fix bug in abort message processing."Christopher Ferris2013-10-091-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Fix bug in abort message processing."Christopher Ferris2013-10-101-1/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix bug in abort message processing.Christopher Ferris2013-10-091-1/+0
| | | |/ / / / / / / /
* | | | | | | | | | | am 1101c1eb: am 1c39fdcd: merge in KQS81MEd Heyl2013-10-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 1c39fdcd: merge in KQS81MEd Heyl2013-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | merge in KQS81MEd Heyl2013-10-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-190-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-160-0/+0
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-110-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | Only check caller when deriving permissions.Jeff Sharkey2013-08-301-0/+5
| | | | | | | | | | * | | | | | | | | Fix recursive locking bug.Jeff Sharkey2013-08-301-21/+36