Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp | Brian Carlstrom | 2013-04-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge "Add OkHttp to the boot classpath." | Brian Carlstrom | 2013-04-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Add OkHttp to the boot classpath. | jwilson | 2013-04-02 | 1 | -1/+1 |
| |/ | |||||
* | | am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-dev | Mathias Agopian | 2013-04-02 | 25 | -130/+185 |
|\ \ | |||||
| * \ | Merge "move tinyutils into its own namespace" into jb-mr2-dev | Mathias Agopian | 2013-04-02 | 25 | -130/+185 |
| |\ \ | |||||
| | * | | move tinyutils into its own namespace | Mathias Agopian | 2013-04-01 | 25 | -130/+185 |
* | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-04-02 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-01 | 0 | -0/+0 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
* | | | | | am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr... | Benoit Goby | 2013-04-02 | 1 | -4/+6 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev | Benoit Goby | 2013-04-02 | 1 | -4/+6 |
| |\ \ \ \ | |||||
| | * | | | | adb: Prevent registering usb_disconnect twice | Benoit Goby | 2013-04-01 | 1 | -4/+6 |
| | |/ / / | |||||
* | | | | | am ded2e5ac: debuggerd now notifies the Activity Manager about native crashes | Christopher Tate | 2013-04-02 | 6 | -7/+106 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | debuggerd now notifies the Activity Manager about native crashes | Christopher Tate | 2013-04-01 | 6 | -7/+106 |
| |/ / / | |||||
* | | | | am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c" | Colin Cross | 2013-03-29 | 1 | -0/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge "adb: Remove execute permission on usb_vendor.c" | Colin Cross | 2013-03-29 | 1 | -0/+0 |
| |\ \ \ | |||||
| | * | | | adb: Remove execute permission on usb_vendor.c | Benoit Goby | 2013-03-29 | 1 | -0/+0 |
| |/ / / | |||||
* | | | | resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp | Benoit Goby | 2013-03-29 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge changes I0694ed72,I9f0622e0,Ib8c5196c | Colin Cross | 2013-03-29 | 1 | -0/+15 |
| |\ \ \ | |||||
| | * | | | Add BYD's USB Vendor ID | sunxiaoqi | 2013-03-29 | 1 | -0/+3 |
| | * | | | Add USB Vendor ID for Xiaomi | Gary Hua | 2013-03-29 | 1 | -0/+3 |
| | * | | | Add vendor IDs to adb | Sam Lin | 2013-03-29 | 1 | -0/+9 |
| |/ / / | |||||
* | | | | am 9b32f87a: Merge "Add Mips memset speedup" | Keun-young Park | 2013-03-29 | 2 | -0/+35 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Add Mips memset speedup" | Keun-young Park | 2013-03-29 | 2 | -0/+35 |
| |\ \ \ | |||||
| | * | | | Add Mips memset speedup | Duane Sand | 2012-08-29 | 2 | -0/+35 |
* | | | | | am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_... | Nick Kralevich | 2013-03-29 | 0 | -0/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH" | Nick Kralevich | 2013-03-29 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH" | Nick Kralevich | 2013-03-29 | 1 | -1/+18 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge "run-as: Don't require CAP_DAC_READ_SEARCH" | Nick Kralevich | 2013-03-29 | 1 | -1/+18 |
| | | |\ \ \ | |||||
| | | | * | | | run-as: Don't require CAP_DAC_READ_SEARCH | Nick Kralevich | 2013-03-29 | 1 | -1/+18 |
| | | |/ / / | |||||
* | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-03-29 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-03-28 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from package... | Geremy Condra | 2013-03-28 | 3 | -5/+23 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pa... | Geremy Condra | 2013-03-28 | 3 | -5/+23 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libseli... | Geremy Condra | 2013-03-28 | 3 | -5/+23 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge "run-as: Get seinfo from packages.list and pass to libselinux." | Geremy Condra | 2013-03-28 | 3 | -5/+23 |
| | | |\ \ \ \ | |||||
| | | | * | | | | run-as: Get seinfo from packages.list and pass to libselinux. | Robert Craig | 2013-03-28 | 3 | -5/+23 |
| | | |/ / / / | |||||
* | | | | | | | am 774f9299: libcutils: add support for app tracing | Jamie Gennis | 2013-03-28 | 2 | -6/+96 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | libcutils: add support for app tracing | Jamie Gennis | 2013-03-28 | 2 | -6/+96 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy f... | Geremy Condra | 2013-03-27 | 1 | -1/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location" | Geremy Condra | 2013-03-27 | 1 | -1/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | am c0e1bc1c: Merge "Drop /data/system as a policy file location" | Geremy Condra | 2013-03-27 | 1 | -1/+0 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge "Drop /data/system as a policy file location" | Geremy Condra | 2013-03-27 | 1 | -1/+0 |
| | | |\ \ \ | |||||
| | | | * | | | Drop /data/system as a policy file location | William Roberts | 2013-03-26 | 1 | -1/+0 |
| | | |/ / / | |||||
* | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-03-26 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-03-26 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-03-25 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-03-21 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
* | | | \ \ \ \ | am d118394d: Merge "Properly handle cases of multiple inotify events" into jb... | Igor Murashkin | 2013-03-26 | 1 | -39/+44 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev | Igor Murashkin | 2013-03-26 | 1 | -39/+44 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Properly handle cases of multiple inotify events | Ziv Hendel | 2013-03-25 | 1 | -39/+44 |
| | |/ / / / / / |