summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| | | |\ \ \ \
| | | | * | | | run-as: Get seinfo from packages.list and pass to libselinux.Robert Craig2013-03-283-5/+23
| | | |/ / / /
* | | | | | | am 774f9299: libcutils: add support for app tracingJamie Gennis2013-03-282-6/+96
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | libcutils: add support for app tracingJamie Gennis2013-03-282-6/+96
| | |_|/ / / | |/| | | |
* | | | | | am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy f...Geremy Condra2013-03-271-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"Geremy Condra2013-03-271-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am c0e1bc1c: Merge "Drop /data/system as a policy file location"Geremy Condra2013-03-271-1/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Drop /data/system as a policy file location"Geremy Condra2013-03-271-1/+0
| | | |\ \ \
| | | | * | | Drop /data/system as a policy file locationWilliam Roberts2013-03-261-1/+0
| | | |/ / /
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-250-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-210-0/+0
| | | |\ \ \ \
* | | | \ \ \ \ am d118394d: Merge "Properly handle cases of multiple inotify events" into jb...Igor Murashkin2013-03-261-39/+44
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Properly handle cases of multiple inotify events" into jb-mr2-devIgor Murashkin2013-03-261-39/+44
| |\ \ \ \ \ \ \
| | * | | | | | | Properly handle cases of multiple inotify eventsZiv Hendel2013-03-251-39/+44
| | |/ / / / / /