summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | Merge "Fix build error in init when building with bootchart"Conley Owens2011-07-211-0/+2
| | | | |\ \ \
| | | | | * | | Fix build error in init when building with bootchartCarl-Emil Lagerstedt2011-04-111-0/+2
* | | | | | | | Merge "Dump the HID descriptor when available."Jeff Brown2011-07-251-4/+47
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Dump the HID descriptor when available.Jeff Brown2011-07-241-4/+47
* | | | | | | | Merge "Fix bug 4211099 channel constants and 7.1 mask"Jean-Michel Trivi2011-07-251-3/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug 4211099 channel constants and 7.1 maskJean-Michel Trivi2011-07-241-3/+22
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "NetlinkEvents: adding support for iptables' quota2 NFLOG messages."JP Abgrall2011-07-251-25/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | NetlinkEvents: adding support for iptables' quota2 NFLOG messages.JP Abgrall2011-07-141-25/+54
* | | | | | | | Merge "Fix returning errno values which should be negative."Mike Lockwood2011-07-221-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix returning errno values which should be negative.Yuncheol Heo2011-07-221-3/+3
* | | | | | | | support for "Add an ANativeWindow API for SurfaceFlinger to suggest an optima...Mathias Agopian2011-07-191-0/+58
* | | | | | | | am 01acea11: am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendo...Mike Lockwood2011-07-181-0/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| | | | |\ \ \ \
| | | | | * | | | adb: Add USB vendor ID for LenovoMike Lockwood2011-07-141-0/+3
* | | | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-07-180-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ reset, and keep historyandroid-merger2011-07-080-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am aa4a66a1: am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world reada...Conley Owens2011-07-151-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system w...Conley Owens2011-07-151-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /dat...Conley Owens2011-07-151-0/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | am d0b93f43: Merge "Create world readable, system writeable /data/resource-ca...Conley Owens2011-07-151-0/+5
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge "Create world readable, system writeable /data/resource-cache."Conley Owens2011-07-151-0/+5
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Create world readable, system writeable /data/resource-cache.MÃ¥rten Kongstad2011-05-311-0/+5
* | | | | | | | | | | | am 070ec8e0: resolved conflicts for merge of 3ea075be to honeycomb-plus-aospKenny Root2011-07-151-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | resolved conflicts for merge of 3ea075be to honeycomb-plus-aospKenny Root2011-07-151-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am ca0a6f04: am 008cbcd0: Merge "Add -F for classify to ls"Kenny Root2011-07-141-2/+24
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 008cbcd0: Merge "Add -F for classify to ls"Kenny Root2011-07-141-2/+24
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Add -F for classify to ls"Kenny Root2011-07-141-2/+24
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Add -F for classify to lsKenny Root2011-07-131-2/+24
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Show why umount failed."Jeff Brown2011-07-141-5/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Show why umount failed.Jeff Brown2011-07-141-5/+6
* | | | | | | | | | | am 51ca95dc: am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to ...Jean-Baptiste Queru2011-07-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-p...Jean-Baptiste Queru2011-07-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" int...Jean-Baptiste Queru2011-07-120-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aospDavid 'Digit' Turner2011-07-120-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ merge intel x86 patches into gingerbread branchDavid 'Digit' Turner2011-07-0842-344/+4013
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | pixelflinger: back-port AOSP master version.David 'Digit' Turner2011-06-1514-119/+975
| | | | | * | | | | | | | x86: Add vold.fstab to mount the SD cardJun Nakajima2011-06-151-0/+4
| | | | | * | | | | | | | Assembly coded android_memset16 and android_memset32Bruce Beare2011-06-158-1/+1334
| | | | | * | | | | | | | debuggerd: IA versionBruce Beare2011-06-1511-24/+285
| | | | | * | | | | | | | debuggerd: Reorganize to facilitate IA commitBruce Beare2011-06-1511-212/+1207
| | | | | * | | | | | | | Set the modes for rc.* files in /system/etcBruce Beare2011-06-151-0/+1
| | | | | * | | | | | | | DBUS is not fully implemented. Disable it for nowBruce Beare2011-06-151-1/+1
| | | | | * | | | | | | | debuggerd: Show function names in tombstone backtracesMeng Hu2011-06-156-8/+227
| | | | |/ / / / / / / /
* | | | | | | | | | | | am f75a2ed2: Merge from gingerbread-plus-aospJean-Baptiste Queru2011-07-141-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge from gingerbread-plus-aospJean-Baptiste Queru2011-07-122-1/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 4c6b494a: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile P...Mike Lockwood2011-07-122-1/+10
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"Mike Lockwood2011-07-122-1/+10
| | | |\ \ \ \ \ \ \ \