[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617

Browse Source

am: 489edfda20

Change-Id: Iee819080ed09d2136c0f7467be770e0e5a36437f

...

This commit is contained in:

Ian Kasprzak

2019-08-28 20:29:40 -07:00

committed by android-build-merger

parent 65d8b4afc7 489edfda20

commit 2b7053a0bd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available