summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add missing include."android-wear-8.0.0_r1Treehugger Robot2018-01-121-0/+1
|\
| * Add missing include.Dan Albert2018-01-111-0/+1
|/
* Merge "goldfish: fix network properties"Treehugger Robot2017-12-281-0/+3
|\
| * goldfish: fix network propertiesbohu2017-12-271-0/+3
|/
* Merge "goldfish: re-enable emualtor to grab wake_lock"Treehugger Robot2017-12-252-10/+3
|\
| * goldfish: re-enable emualtor to grab wake_lockbohu2017-12-242-10/+3
|/
* Merge "Require two samples to enroll an new fingerprint template"Treehugger Robot2017-12-201-10/+12
|\
| * Require two samples to enroll an new fingerprint templateWeilun Du2017-12-191-10/+12
|/
* Merge "goldfish: add boot test script"Treehugger Robot2017-12-141-0/+56
|\
| * goldfish: add boot test scriptbohu2017-12-141-0/+56
|/
* Merge "goldfish: avoid crashing ranchu-core"Treehugger Robot2017-12-112-2/+4
|\
| * goldfish: avoid crashing ranchu-corebohu2017-12-102-2/+4
|/
* Merge "goldfish: get a default gralloc"Bo Hu2017-12-016-0/+1074
|\
| * Merge "goldfish: get a default gralloc"Bo Hu2017-12-016-0/+1074
| |\
| | * goldfish: get a default grallocbohu2017-12-016-0/+1074
| |/
* | Merge "goldfish: support system as root"bohu2017-11-303-3/+0
|\|
| * Merge "goldfish: support system as root"Treehugger Robot2017-11-303-3/+0
| |\
| | * goldfish: support system as rootbohu2017-11-293-3/+0
* | | Merge "qemu-props: notify host on boot complete"bohu2017-11-301-9/+38
|\| |
| * | Merge "qemu-props: notify host on boot complete"Treehugger Robot2017-11-301-9/+38
| |\ \ | | |/ | |/|
| | * qemu-props: notify host on boot completebohu2017-11-301-9/+38
| |/
* | Merge commit '92475355055a6c064f0a4a7e1ae213089fb34254' fromXin Li2017-11-0718-17/+43
|\ \
| * \ Merge "Add missing includes." am: 60496be1c1 am: cdbdf57e33Dan Albert2017-10-171-0/+2
| |\ \
| | * \ Merge "Add missing includes." am: 60496be1c1Dan Albert2017-10-171-0/+2
| | |\ \
| * | | | resolve merge conflicts of d1f3f8f to stage-aosp-master am: 2a6c70fd6bDan Albert2017-10-170-0/+0
| |\| | |
| | * | | resolve merge conflicts of d1f3f8f to stage-aosp-masterDan Albert2017-10-170-0/+0
| | |\ \ \
| * | \ \ \ Revert "Emulator: add overlay for goldfish device"Weilun Du2017-10-111-39/+0
| |\ \ \ \ \
| | * | | | | Revert "Emulator: add overlay for goldfish device"oreo-mr1-devWeilun Du2017-10-041-39/+0
| * | | | | | Merge "audio: Fix search location of audio.primary.goldfish_legacy.so" am: dd...Miodrag Dinic2017-09-281-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "audio: Fix search location of audio.primary.goldfish_legacy.so" am: dd...Miodrag Dinic2017-09-281-2/+2
| | |\ \ \ \ \
| * | | | | | | Merge "Add fstab.ranchu.mips" am: 957f5cad7a am: 8c22adb6a0Miodrag Dinic2017-09-201-0/+7
| |\| | | | | |
| | * | | | | | Merge "Add fstab.ranchu.mips" am: 957f5cad7aMiodrag Dinic2017-09-201-0/+7
| | |\ \ \ \ \ \
| * | | | | | | | Merge "Allow multiple Sensor Flush operations" am: 8f8979f4a7 am: 1e372982d3Jim Kaye2017-09-201-13/+32
| |\| | | | | | |
| | * | | | | | | Merge "Allow multiple Sensor Flush operations" am: 8f8979f4a7Jim Kaye2017-09-201-13/+32
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge "Specify keystore dependency on libhardware_headers" into oc-mr1-devIsaac Chen2017-09-081-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Specify keystore dependency on libhardware_headers" into oc-mr1-devIsaac Chen2017-09-081-0/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Specify keystore dependency on libhardware_headersIsaac Chen2017-09-071-0/+1
| * | | | | | | | | | goldfish: set correct sepolicy versionbohu2017-09-081-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | goldfish: set correct sepolicy versionbohu2017-09-071-1/+1
| * | | | | | | | | | Fix signaling of uncalibrated magnetic sensorJim Kaye2017-09-061-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | Fix signaling of uncalibrated magnetic sensorJim Kaye2017-09-061-1/+1
| | |/ / / / / / / /
| * | | | | | | | | Merge "Fix signaling of uncalibrated magnetic sensor" am: 57b8638b7b -s ours...Jim Kaye2017-09-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Fix signaling of uncalibrated magnetic sensor" am: 57b8638b7b -s oursJim Kaye2017-09-060-0/+0
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Merge "DO NOT MERGE ANYWHERE : Emulator should not use widevine in AOSP image...Yahan Zhou2017-09-050-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Merge "DO NOT MERGE ANYWHERE : Emulator should not use widevine in AOSP image...Yahan Zhou2017-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge "Enable keymaster3" am: 645dbc834a -s ours am: f48fdc220bbohu2017-09-010-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Enable keymaster3" am: 645dbc834a -s oursbohu2017-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge "goldfish: update to 331578d04" am: ee12b2db7e -s ours am: af6488839fBo Hu2017-09-010-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "goldfish: update to 331578d04" am: ee12b2db7e -s oursBo Hu2017-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Enable keymaster3bohu2017-08-318-543/+1203
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |