summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Expand)AuthorAgeFilesLines
* merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-141-7/+5
|\
| * Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-121-7/+5
* | am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for se...Chris Tate2011-01-091-6/+3
|\ \ | |/
| * DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restoresChris Tate2011-01-091-6/+3
* | am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 1002...Dianne Hackborn2011-01-091-0/+59
|\ \ | |/
| * Fix issue # 3227963: SecurityException: Neither user 10023 nor...Dianne Hackborn2010-12-221-0/+59
* | am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> ...Dianne Hackborn2010-12-131-8/+68
|\ \ | |/
| * Fix issue #3154576: battery stats checkin should include UID -> packages+ mapDianne Hackborn2010-12-131-8/+68
* | Merge from open-source masterJean-Baptiste Queru2010-12-021-3/+5
|\ \
| * | Fix crash by "adb shell pm list permissions -f|-s"Ali Utku Selen2010-11-301-3/+5
* | | Merge 42c94791 from open-source masterJean-Baptiste Queru2010-11-041-7/+5
|\ \ \ | |/ /
| * | Fix the animation disappeared issueChih-Wei Huang2010-11-031-7/+5
* | | am 40763914: Merge "Exit immediately on some linklib failures" into gingerbreadKenny Root2010-10-221-4/+2
|\ \ \ | | |/ | |/|
| * | Exit immediately on some linklib failuresKenny Root2010-10-211-4/+2
* | | am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerb...Nick Kralevich2010-10-211-13/+15
|\ \ \ | |/ /
| * | allow dumpstate to work for non-root users.Nick Kralevich2010-10-211-13/+15
* | | am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead...Andreas Huber2010-10-151-3/+3
|\ \ \ | |/ /
| * | Merge "Include the framework copy of the OpenMAX headers instead of referenci...Andreas Huber2010-10-151-3/+3
| |\ \
| | * | Include the framework copy of the OpenMAX headers instead of referencing exte...Andreas Huber2010-10-151-3/+3
* | | | Merge a851d8d0 from gingerbreadJean-Baptiste Queru2010-10-151-0/+1
|\ \ \ \ | |/ / /
| * | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-151-0/+1
| |/ /
* | | am 54e01e0f: Merge "Symlink application lib directory when on SD card" into g...Kenny Root2010-10-073-0/+168
|\ \ \ | |/ /
| * | Symlink application lib directory when on SD cardKenny Root2010-10-073-0/+168
* | | am 19058877: Merge "refactored screenshot code" into gingerbreadMathias Agopian2010-10-041-18/+7
|\ \ \ | |/ /
| * | refactored screenshot codeMathias Agopian2010-10-041-18/+7
* | | am b9aacfdf: Merge "new screencap command" into gingerbreadMathias Agopian2010-10-042-0/+71
|\ \ \ | |/ /
| * | new screencap commandMathias Agopian2010-10-042-0/+71
* | | am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys...Chia-chi Yeh2010-10-011-24/+71
|\ \ \ | |/ /
| * | Merge "KeyStore: Update the parameters of generating master keys." into ginge...Chia-chi Yeh2010-10-011-24/+71
| |\ \
| | * | KeyStore: Update the parameters of generating master keys.Chia-chi Yeh2010-10-011-24/+71
* | | | am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NP...Fabrice Di Meglio2010-10-011-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot ...Fabrice Di Meglio2010-10-011-1/+4
| |\ \ \ | | |/ / | |/| |
| | * | Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run ...Fabrice Di Meglio2010-10-011-1/+4
* | | | am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbreadChia-chi Yeh2010-09-301-1/+1
|\ \ \ \ | |/ / /
| * | | KeyStore: Initialize IV correctly.Chia-chi Yeh2010-09-301-1/+1
* | | | am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has ...Chia-chi Yeh2010-09-301-1/+4
|\ \ \ \ | |/ / /
| * | | KeyStore: Fix the return value when send() or recv() has an error.Chia-chi Yeh2010-09-301-1/+4
| |/ /
* | | am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+6
|\ \ \ | |/ /
| * | Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+6
| |\ \
| | * | Squashed commit of the following:Andreas Huber2010-09-271-0/+6
* | | | am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." in...Hung-ying Tyan2010-09-271-0/+1
|\ \ \ \ | |/ / /
| * | | Move SipService out of SystemServer to phone process.Hung-ying Tyan2010-09-281-0/+1
| |/ /
* | | am a7ef18fc: Merge "Some debugging support." into gingerbreadDianne Hackborn2010-09-242-13/+105
|\ \ \ | |/ /
| * | Some debugging support.Dianne Hackborn2010-09-242-13/+105
* | | am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write...Andreas Huber2010-09-241-42/+111
|\ \ \ | |/ /
| * | Instead of just writing one track to the .mp4 file, write all of them (at mos...Andreas Huber2010-09-241-42/+111
* | | am 37155854: Merge "Proper sync-frame detection for sources that don\'t alrea...Andreas Huber2010-09-241-12/+105
|\ \ \ | |/ /
| * | Merge "Proper sync-frame detection for sources that don't already provide it....Andreas Huber2010-09-241-12/+105
| |\ \
| | * | Proper sync-frame detection for sources that don't already provide it.Andreas Huber2010-09-231-12/+105
* | | | am 287952c3: Fix issue #3022508: Crash during media scanDianne Hackborn2010-09-231-0/+214
|\ \ \ \ | |/ / /