No description
Find a file
Sundong Ahn 68f2e828d5 DO NOT MERGE: resolve merge conflicts of e46ab1fd to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia68993a22b975d9a5dd19175988077481ded7559
2017-08-28 21:35:37 +00:00
audio Merge "Audio test statically links to dependencies." into oc-mr1-dev 2017-08-16 17:33:24 +00:00
automotive Merge Vehicle HAL 2.1 iface to 2.0 2017-08-24 21:59:18 -07:00
biometrics biometrics: fingerprint: add locking to default impl 2017-08-18 21:22:46 +00:00
bluetooth Merge "Bluetooth: Return false when not shut down" into oc-mr1-dev 2017-08-25 17:38:18 +00:00
boot Revert "Revert "Updating all makefiles."" 2017-08-11 23:02:01 +00:00
broadcastradio Updating all makefiles. 2017-08-14 21:05:52 +00:00
camera Merge "Camera: Add new minor revision camera.device@3.3" into oc-mr1-dev 2017-08-24 18:38:39 +00:00
cas Update make file for vndk enabled. 2017-08-04 14:12:23 +09:00
configstore DO NOT MERGE: resolve merge conflicts of e46ab1fd to oc-mr1-dev-plus-aosp 2017-08-28 21:35:37 +00:00
contexthub Merge "contexthub: Pass target API version in new fields" into oc-mr1-dev 2017-08-24 17:38:34 +00:00
drm Merge "Drm test static links to HAL def libs." into oc-mr1-dev 2017-08-24 21:54:47 +00:00
dumpstate Updating all makefiles. 2017-08-14 20:25:09 +00:00
gatekeeper Updating all makefiles. 2017-08-14 20:25:09 +00:00
gnss Updating all makefiles. 2017-08-14 20:25:09 +00:00
graphics Updating all makefiles. 2017-08-14 20:25:09 +00:00
health Updating all makefiles. 2017-08-14 20:25:09 +00:00
ir Revert "Revert "Updating all makefiles."" 2017-08-11 23:02:01 +00:00
keymaster Updating all makefiles. 2017-08-14 20:25:09 +00:00
light Updating all makefiles. 2017-08-14 20:25:09 +00:00
media Merge "bug fix: output colorformat configuration fixed" into oc-dev am: 1e15657ca1 2017-08-25 05:20:42 +00:00
memtrack Updating all makefiles. 2017-08-14 20:25:09 +00:00
minijail configstore: sandbox with seccomp filter 2017-08-10 10:34:08 -07:00
neuralnetworks Fix test that broke when number of ADD inputs increased from 2 to 3. 2017-08-25 16:27:38 -07:00
nfc Revert "Revert "Updating all makefiles."" 2017-08-11 23:02:01 +00:00
oemlock Revert "Revert "Updating all makefiles."" 2017-08-11 23:02:01 +00:00
power Updating all makefiles. 2017-08-14 20:25:09 +00:00
radio Revert "Revert "Updating all makefiles."" 2017-08-11 23:02:01 +00:00
renderscript Load libRS_internal.so from the rs namespace 2017-08-16 23:35:57 +09:00
sensors Merge "Sensor VTS testBatchingOperation flakiness fix" into oc-dev am: 751953859c 2017-08-25 22:23:40 +00:00
soundtrigger Updating all makefiles. 2017-08-14 20:25:09 +00:00
tests Move android.hardware.tests.libhwbinder@1.0-impl to system.img 2017-08-17 00:10:20 +00:00
tetheroffload Merge "Tetheroffload tests static link to HAL def libs." into oc-mr1-dev 2017-08-14 22:26:09 +00:00
thermal Updating all makefiles. 2017-08-14 20:25:09 +00:00
tv Updating all makefiles. 2017-08-14 20:25:09 +00:00
usb Updating all makefiles. 2017-08-14 20:25:09 +00:00
vibrator Updating all makefiles. 2017-08-14 20:25:09 +00:00
vr Updating all makefiles. 2017-08-14 20:25:09 +00:00
weaver Revert "Revert "Updating all makefiles."" 2017-08-11 23:02:01 +00:00
wifi Merge "[AWARE] Fix maxNdpSessions documentation" into oc-mr1-dev 2017-08-15 23:05:09 +00:00
.clang-format .clang-format: 100 lines 2017-05-02 16:45:27 -07:00
Android.bp Update comments for VtsHalTargetTestDefaults. 2017-08-03 16:44:29 -07:00
CleanSpec.mk Configstore HAL is down-revisioned to 1.0 2017-08-25 17:05:29 +00:00
compatibility_matrix.26.xml Merge "Configstore HAL is down-revisioned to 1.0" into oc-mr1-dev 2017-08-28 04:52:23 +00:00
compatibility_matrix.current.xml Merge "Configstore HAL is down-revisioned to 1.0" into oc-mr1-dev 2017-08-28 04:52:23 +00:00
compatibility_matrix.legacy.xml Merge "Configstore HAL is down-revisioned to 1.0" into oc-mr1-dev 2017-08-28 04:52:23 +00:00
current.txt Merge Vehicle HAL 2.1 iface to 2.0 2017-08-24 21:59:18 -07:00
MODULE_LICENSE_APACHE2 Apache2 module license. 2016-08-30 11:28:36 -07:00
NOTICE Apache2 module license. 2016-08-30 11:28:36 -07:00
OWNERS Add OWNERS in hardware/interfaces 2017-06-12 13:20:12 -07:00
PREUPLOAD.cfg Enable the clang-format pre-submit hook 2017-03-30 13:26:49 -07:00
update-base-files.sh Add annotations to create gnss-base.h 2017-01-23 08:41:15 -08:00
update-makefiles.sh Update makefiles from anywhere. 2017-05-11 15:42:32 -07:00