Zhuoyao Zhang 9ff0bb218b resolve merge conflicts of 8d92561 to oc-mr1-dev ...

Test: I solemnly swear I tested this conflict resolution.

2017-07-25 21:14:07 -07:00

..

bar

Merge "Move all hidl_test dependencies to the system.img"

2017-07-18 08:50:32 +00:00

baz

Merge "Move all hidl_test dependencies to the system.img"

2017-07-18 08:50:32 +00:00

expression

Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7

2017-05-20 00:19:40 +00:00

extension/light/2.0

Update makefiles. (2/2)

2017-05-22 17:15:20 +00:00

foo

Merge "Move all hidl_test dependencies to the system.img"

2017-07-18 08:50:32 +00:00

hash/1.0

Move all hidl_test dependencies to the system.img

2017-07-17 18:36:02 -07:00

inheritance

Merge "Move all hidl_test dependencies to the system.img"

2017-07-18 08:50:32 +00:00

libhwbinder

Merge "libhwbinder test: Android.mk -> Android.bp" am: 154040c0ca am: e7d4e66030

2017-05-25 21:03:20 +00:00

memory/1.0

Move all hidl_test dependencies to the system.img

2017-07-17 18:36:02 -07:00

msgq

Move android.hardware.tests.msgq@1.0-impl to system.img

2017-07-25 20:17:03 +00:00

multithread/1.0

Move multithread impl to system.

2017-07-20 03:07:41 +00:00

pointer

Merge "Move all hidl_test dependencies to the system.img"

2017-07-18 08:50:32 +00:00

Android.bp

Interface for configureRpcThreadpool tests

2017-07-14 20:16:20 +00:00