summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix google-explicit-constructor warnings in libhardware_legacy"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot2016-06-301-1/+1
|\
| * Fix google-explicit-constructor warnings in libhardware_legacyChih-Hung Hsieh2016-06-301-1/+1
|/
* Merge "Fix misc-macro-parentheses warnings in hardware_legacy."Chih-hung Hsieh2016-06-271-2/+2
|\
| * Fix misc-macro-parentheses warnings in hardware_legacy.Chih-Hung Hsieh2016-06-101-2/+2
* | Merge "Remove qemu dependency."David Turner2016-06-227-641/+1
|\ \
| * | Remove qemu dependency.David 'Digit' Turner2016-06-217-641/+1
|/ /
* | Merge "[qemu] Use new QEMU pipe header."David Turner2016-06-211-3/+4
|\ \ | |/ |/|
| * [qemu] Use new QEMU pipe header.David 'Digit' Turner2016-06-161-3/+4
|/
* Merge "libhardware_legacy should depend on libmedia"android-wear-n-preview-1android-n-preview-4android-n-preview-3Treehugger Robot2016-04-201-1/+1
|\
| * libhardware_legacy should depend on libmediaChristopher Wiley2016-04-201-1/+1
|/
* Merge "Use libmedia header paths in legacy audio libs"Treehugger Robot2016-04-151-0/+3
|\
| * Use libmedia header paths in legacy audio libsChristopher Wiley2016-04-141-0/+3
|/
* Merge "Make libhardware_legacy warning clean."android-n-preview-2android-n-preview-1brillo-m10-releasebrillo-m10-devDan Albert2016-02-035-6/+8
|\
| * Make libhardware_legacy warning clean.Dan Albert2016-02-025-6/+8
|/
* Merge "Make wake_lock acquire/release errors explicit"brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devRom Lemarchand2015-12-101-9/+19
|\
| * Make wake_lock acquire/release errors explicitRom Lemarchand2015-12-101-9/+19
|/
* Merge "Vibra: Remove vibrator AOSP implementation from libhardware_legacy"Colin Cross2015-11-174-131/+1
|\
| * Vibra: Remove vibrator AOSP implementation from libhardware_legacyVincent Becker2015-11-174-131/+1
|/
* am 0f7bacf2: am 35edc538: Merge "Prepare to remove libhardware_legacy from gl...Dan Willemsen2015-09-282-4/+11
|\
| * am 35edc538: Merge "Prepare to remove libhardware_legacy from global include ...brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devDan Willemsen2015-09-282-4/+11
| |\
| | * Merge "Prepare to remove libhardware_legacy from global include dirs"Dan Willemsen2015-09-282-4/+11
| | |\
| | | * Prepare to remove libhardware_legacy from global include dirsDan Willemsen2015-09-282-4/+11
| | |/
* | | am eea5d887: (-s ours) am c9183441: Merge "Remove unused systemTime() and inc...Daniel Erat2015-08-270-0/+0
|\| |
| * | am c9183441: Merge "Remove unused systemTime() and include utils/Timers.h."Daniel Erat2015-08-103-10/+2
| |\|
* | | am 19d9b8fc: (-s ours) am 87175f0b: Merge "Stop being silly."Elliott Hughes2015-08-270-0/+0
|\| |
| * | am 87175f0b: Merge "Stop being silly."Elliott Hughes2015-07-311-1/+0
| |\ \
* | | | am 2c1817a8: (-s ours) am 8af982d0: Clean up bad command implementationJerry Lee2015-08-270-0/+0
|\| | |
| * | | am 8af982d0: Clean up bad command implementationJerry Lee2015-07-161-0/+1
| |\ \ \
* | | | | am 7c20e687: (-s ours) am da1c7fa2: make wifi_load_driver blockingMaddest Chang2015-08-270-0/+0
|\| | | |
| * | | | am da1c7fa2: make wifi_load_driver blockingMaddest Chang2015-07-152-0/+48
| |\ \ \ \
* | \ \ \ \ am c9183441: Merge "Remove unused systemTime() and include utils/Timers.h."Daniel Erat2015-08-103-10/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge "Remove unused systemTime() and include utils/Timers.h."android-m-preview-2Daniel Erat2015-08-103-10/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove unused systemTime() and include utils/Timers.h.Daniel Erat2015-08-053-10/+2
| |/ / / /
* | | | | am 87175f0b: Merge "Stop being silly."Elliott Hughes2015-07-311-1/+0
|\| | | |
| * | | | Merge "Stop being silly."Elliott Hughes2015-07-311-1/+0
| |\ \ \ \
| | * | | | Stop being silly.Elliott Hughes2015-07-311-1/+0
| |/ / / /
* | | | | am 8af982d0: Clean up bad command implementationJerry Lee2015-07-161-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Clean up bad command implementationandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-devmarshmallow-devJerry Lee2015-07-151-0/+1
| | |_|/ | |/| |
* | | | am da1c7fa2: make wifi_load_driver blockingMaddest Chang2015-07-152-0/+48
|\| | | | |_|/ |/| |
| * | make wifi_load_driver blockingMaddest Chang2015-07-152-0/+48
* | | am c9694304: Add wifi offload feature: mkeep_aliveJerryLee2015-06-252-0/+34
|\| |
| * | Add wifi offload feature: mkeep_aliveJerryLee2015-06-242-0/+34
* | | am 1de429dc: Add a debuggability interface: stop loggingJerryLee2015-06-252-1/+2
|\| |
| * | Add a debuggability interface: stop loggingJerryLee2015-06-242-1/+2
* | | am 7b9ec3c4: Added RSSI monitor bitmaskAshwin2015-06-251-0/+1
|\| |
| * | Added RSSI monitor bitmaskAshwin2015-06-241-0/+1
* | | am bd18526a: am e853591..90f8307 from mirror-m-wireless-internal-releaseVinit Deshpande2015-06-052-0/+52
|\| |
| * | am e853591..90f8307 from mirror-m-wireless-internal-releaseVinit Deshpande2015-06-052-0/+52
| |\ \
| | * | wifi hal definitions for keep alive packet offload and rssi monitoringPrerepa Viswanadham2015-06-031-0/+12
| | * | Adding API for setting LCI/LCR information.Amarnath Hullur Subramanyam2015-06-032-0/+40