summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"Keun-young Park2013-04-050-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "rootdir: goldfish: mount debugfs on boot time"Keun-young Park2013-04-051-0/+1
| |\ \ \ \ \
| | * | | | | rootdir: goldfish: mount debugfs on boot timeYoung-Ho Cha2013-03-101-0/+1
* | | | | | | am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-051-36/+44
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Add -i option to toolbox cmd lsWilliam Roberts2013-04-031-36/+44
| |/ / / / /
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-030-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-030-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-020-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into...Brian Carlstrom2013-04-031-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aospBrian Carlstrom2013-04-031-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge "Add OkHttp to the boot classpath."Brian Carlstrom2013-04-031-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Add OkHttp to the boot classpath.jwilson2013-04-021-1/+1
| | |/ / / / / /
* | | | | | | | am c1e47294: Merge "Give system ownership of selinux load and enforce files."...Geremy Condra2013-04-031-0/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge "Give system ownership of selinux load and enforce files." into jb-mr2-devGeremy Condra2013-04-031-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Give system ownership of selinux load and enforce files.Geremy Condra2013-04-031-0/+4
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 8e15eabd: Apply the correct SELinux label for the properties workspace.Geremy Condra2013-04-031-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Apply the correct SELinux label for the properties workspace.Geremy Condra2013-04-031-0/+1
| |/ / / / /
* | | | | | am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-devMathias Agopian2013-04-0225-130/+185
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "move tinyutils into its own namespace" into jb-mr2-devMathias Agopian2013-04-0225-130/+185
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | move tinyutils into its own namespaceMathias Agopian2013-04-0125-130/+185
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-020-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-010-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr...Benoit Goby2013-04-021-4/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-devBenoit Goby2013-04-021-4/+6
| |\ \ \ \ \
| | * | | | | adb: Prevent registering usb_disconnect twiceBenoit Goby2013-04-011-4/+6
| | |/ / / /
* | | | | | am ded2e5ac: debuggerd now notifies the Activity Manager about native crashesChristopher Tate2013-04-026-7/+106
|\ \ \ \ \ \ | |/ / / / /
| * | | | | debuggerd now notifies the Activity Manager about native crashesChristopher Tate2013-04-016-7/+106
| |/ / / /
* | | | | am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"Colin Cross2013-03-291-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "adb: Remove execute permission on usb_vendor.c"Colin Cross2013-03-291-0/+0
| |\ \ \ \
| | * | | | adb: Remove execute permission on usb_vendor.cBenoit Goby2013-03-291-0/+0
| |/ / / /
* | | | | resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aospBenoit Goby2013-03-291-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge changes I0694ed72,I9f0622e0,Ib8c5196cColin Cross2013-03-291-0/+15
| |\ \ \ \
| | * | | | Add BYD's USB Vendor IDsunxiaoqi2013-03-291-0/+3
| | * | | | Add USB Vendor ID for XiaomiGary Hua2013-03-291-0/+3
| | * | | | Add vendor IDs to adbSam Lin2013-03-291-0/+9
| |/ / / /
* | | | | am 9b32f87a: Merge "Add Mips memset speedup"Keun-young Park2013-03-292-0/+35
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add Mips memset speedup"Keun-young Park2013-03-292-0/+35
| |\ \ \ \
| | * | | | Add Mips memset speedupDuane Sand2012-08-292-0/+35
* | | | | | am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_...Nick Kralevich2013-03-290-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"Nick Kralevich2013-03-290-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"Nick Kralevich2013-03-291-1/+18
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "run-as: Don't require CAP_DAC_READ_SEARCH"Nick Kralevich2013-03-291-1/+18
| | | |\ \ \ \
| | | | * | | | run-as: Don't require CAP_DAC_READ_SEARCHNick Kralevich2013-03-291-1/+18
| | | |/ / / /
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-290-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-280-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from package...Geremy Condra2013-03-283-5/+23
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pa...Geremy Condra2013-03-283-5/+23
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libseli...Geremy Condra2013-03-283-5/+23
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "run-as: Get seinfo from packages.list and pass to libselinux."Geremy Condra2013-03-283-5/+23
| | | |\ \ \ \ \