diff options
| author | Ian Kasprzak <iankaz@google.com> | 2019-08-28 19:52:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 19:52:26 -0700 |
| commit | 0cd1fdd6170b3200ffbd6bc9f7b57d3ccb7d7b28 (patch) | |
| tree | ab6a00135b76c2b9b4b84fef0aae26cb3c0095e6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7bebbb7c6e0d2ce9a8ccddd2ec47ae255e853cd5 (diff) | |
| parent | 33e559a025af6e10057c99f083ac81312e7c2004 (diff) | |
[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 skip reason: subject contains skip directive
Change-Id: I0b9d9a9bf90b97087743609de62b4c1d82cabcea
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions