Neil Fuller b0ed2aa01b resolve merge conflicts of 3649f7c to master ...

Change-Id: Ic16950f1c50f7d06d3c9ae08a6f28e292b89c20f

2016-10-06 11:23:06 +01:00

..

bandwidthtests

…

benchmarks

Switch Parcel to FastNative

2016-09-30 11:19:10 -07:00

bluetoothtests

Update enable/disable code to reduce flakiness

2016-06-08 14:14:37 -07:00

BTtraffic

…

ConnectivityManagerTest

Remove ability to set frequency from WifiAssociationTest

2016-09-20 15:33:49 -07:00

coretests

Move print workflow tests to own apk

2016-10-05 16:56:00 -07:00

hosttests

Merge "Add a test app for suppressed exceptions"

2016-09-07 09:52:50 +00:00

notificationtests

Fixed notificaiton Stress Test

2016-06-21 09:59:53 -07:00

overlaytests

…

SvcMonitor

…

systemproperties

Remove .mk lines that are just setting the default

2016-10-05 13:38:36 +01:00

utillib

…

utiltests

Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]

2016-09-06 15:54:16 -07:00