CY Cheng 0f7856add6 resolve merge conflicts of e58c780571 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352

2018-08-16 10:43:49 +00:00

..

bandwidthtests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

benchmarks

Benchmarks for streams.

2018-04-12 10:43:22 -06:00

bluetoothtests

Merge "Fix the implementation of BluetoothCodecStatus.equals()" am: 3a1ca762c9

2018-04-19 18:08:38 -07:00

BroadcastRadioTests

Fix RadioTunerTest.

2018-04-20 08:41:00 -07:00

BTtraffic

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

ConnectivityManagerTest

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

coretests

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 10:43:49 +00:00

featureflagtests

Update a bunch of AndroidTest for apct suite

2018-03-14 10:03:56 -07:00

hosttests

Merge "Remove references to full_classes_proguard_jar"

2018-07-26 17:59:29 -07:00

notificationtests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

overlaytests

OMS: ensure framework overlays affect newly installed apps

2018-04-30 17:28:35 +01:00

packagemanagertests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

privacytests

Exempt tests for hidden APIs.

2018-04-06 14:54:39 +01:00

SvcMonitor

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

systemproperties

Frameworks: Handle exceptions in SystemProperties callbacks

2018-03-19 20:33:49 -07:00

utillib

…

utiltests

MemoryIntArray: track the owned file descriptor in a PFD.

2018-08-09 16:32:42 -07:00

webkit

Update a bunch of AndroidTest for apct suite

2018-03-14 10:03:56 -07:00