Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab" | JP Abgrall | 2015-01-23 | 1 | -0/+91 |
|\ | |||||
| * | Merge "fs_mgr: Support filesystem labels in fstab" | JP Abgrall | 2015-01-22 | 1 | -0/+91 |
| |\ | |||||
| | * | fs_mgr: Support filesystem labels in fstab | Christoffer Dall | 2015-01-17 | 1 | -0/+91 |
* | | | am 045be135: Merge "liblog: logcat color output corrupted on 32-bit" | Mark Salyzyn | 2015-01-22 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge "liblog: logcat color output corrupted on 32-bit" | Mark Salyzyn | 2015-01-22 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | liblog: logcat color output corrupted on 32-bit | Mark Salyzyn | 2015-01-22 | 1 | -1/+1 |
| |/ / | |||||
* | | | am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd." | Christopher Ferris | 2015-01-22 | 4 | -82/+129 |
|\ \ \ | |/ / | |||||
| * | | Merge "Move 32 bit/64 bit check into debuggerd." | Christopher Ferris | 2015-01-21 | 4 | -82/+129 |
| |\ \ | |||||
| | * | | Move 32 bit/64 bit check into debuggerd. | Christopher Ferris | 2015-01-20 | 4 | -82/+129 |
* | | | | am ce34551c: Merge "Lose id to toybox." | Elliott Hughes | 2015-01-17 | 2 | -58/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Lose id to toybox." | Elliott Hughes | 2015-01-17 | 2 | -58/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Lose id to toybox. | Elliott Hughes | 2015-01-16 | 2 | -58/+0 |
| |/ / | |||||
* | | | am 45c4c06f: Merge "Remove unused cruft from libcutils." | Elliott Hughes | 2015-01-16 | 3 | -117/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge "Remove unused cruft from libcutils." | Elliott Hughes | 2015-01-16 | 3 | -117/+0 |
| |\ \ | |||||
| | * | | Remove unused cruft from libcutils. | Elliott Hughes | 2015-01-15 | 3 | -117/+0 |
| |/ / | |||||
* | | | am 9f72ef89: Merge "Extend to receive NFLOG packets." | Jeff Sharkey | 2015-01-16 | 8 | -19/+86 |
|\ \ \ | |/ / | |||||
| * | | Merge "Extend to receive NFLOG packets." | Jeff Sharkey | 2015-01-16 | 8 | -19/+86 |
| |\ \ | |||||
| | * | | Extend to receive NFLOG packets. | Jeff Sharkey | 2015-01-15 | 8 | -19/+86 |
* | | | | am 17e2f436: Merge "Lose cmp to toybox." | Elliott Hughes | 2015-01-15 | 2 | -92/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Lose cmp to toybox." | Elliott Hughes | 2015-01-15 | 2 | -92/+0 |
| |\ \ \ | |||||
| | * | | | Lose cmp to toybox. | Elliott Hughes | 2015-01-15 | 2 | -92/+0 |
* | | | | | am 791a6905: Merge "Add timed versions of stack dumping functions." | Christopher Ferris | 2015-01-15 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Add timed versions of stack dumping functions." | Christopher Ferris | 2015-01-15 | 2 | -3/+44 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add timed versions of stack dumping functions. | Christopher Ferris | 2015-01-15 | 2 | -3/+44 |
| |/ / / | |||||
* | | | | am 3d7951d4: Merge "Lose chown to toybox." | Elliott Hughes | 2015-01-15 | 4 | -377/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Lose chown to toybox." | Elliott Hughes | 2015-01-15 | 4 | -377/+0 |
| |\ \ \ | |||||
| | * | | | Lose chown to toybox. | Elliott Hughes | 2015-01-15 | 4 | -377/+0 |
| |/ / / | |||||
* | | | | am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into... | Dmitry Shmidt | 2015-01-15 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev | Dmitry Shmidt | 2015-01-15 | 1 | -1/+0 |
| |\ \ \ \ | |||||
| | * | | | | android_filesystem: Remove setuid bits from tcpdump | Dmitry Shmidt | 2015-01-15 | 1 | -1/+0 |
* | | | | | | am c6c3c7d4: Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev | Jean-Michel Trivi | 2015-01-15 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev | Jean-Michel Trivi | 2015-01-15 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove explict use of ASCII encoding | Al Sutton | 2015-01-14 | 2 | -2/+2 |
* | | | | | | | am 6c555ea3: (-s ours) Merge "Return path including executable instead of wit... | Jean-Michel Trivi | 2015-01-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Return path including executable instead of without" into lmp-mr1-dev | Jean-Michel Trivi | 2015-01-15 | 2 | -10/+10 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Return path including executable instead of without | Al Sutton | 2015-01-14 | 2 | -10/+10 |
* | | | | | | | am 1a65d5b3: (-s ours) Merge "Fix building on modern versions of Xcode and OS... | Jean-Michel Trivi | 2015-01-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev | Jean-Michel Trivi | 2015-01-15 | 2 | -15/+16 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fix building on modern versions of Xcode and OS X. | Al Sutton | 2015-01-14 | 2 | -15/+16 |
* | | | | | | | am e232949c: Merge "sdcard : inode numbers must be fully representable as uin... | Narayan Kamath | 2015-01-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge "sdcard : inode numbers must be fully representable as uint32_t." | Narayan Kamath | 2015-01-15 | 1 | -1/+34 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | sdcard : inode numbers must be fully representable as uint32_t. | Narayan Kamath | 2015-01-15 | 1 | -1/+34 |
* | | | | | | | | am 0f86444b: Merge "sdcard : inode numbers must be fully representable as uin... | Narayan Kamath | 2015-01-15 | 1 | -1/+34 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "sdcard : inode numbers must be fully representable as uint32_t." into ... | Narayan Kamath | 2015-01-15 | 1 | -1/+34 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | sdcard : inode numbers must be fully representable as uint32_t. | Narayan Kamath | 2015-01-14 | 1 | -1/+34 |
| | | |_|/ / / / | | |/| | | | | | |||||
* | | | | | | | | am 5f2ff6a9: Add timed versions of stack dumping functions. | Christopher Ferris | 2015-01-15 | 2 | -3/+44 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Add timed versions of stack dumping functions. | Christopher Ferris | 2015-01-14 | 2 | -3/+44 |
| |/ / / / / / | |||||
* | | | | | | | am 41341eea: Merge "Lose date to toybox (as date and hwclock)." | Elliott Hughes | 2015-01-15 | 2 | -228/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge "Lose date to toybox (as date and hwclock)." | Elliott Hughes | 2015-01-14 | 2 | -228/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Lose date to toybox (as date and hwclock). | Elliott Hughes | 2015-01-14 | 2 | -228/+0 |
| |/ / / / / / |