diff options
| author | Ian Kasprzak <iankaz@google.com> | 2019-08-28 20:07:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 20:07:48 -0700 |
| commit | 489edfda2093cdbafc57f78c146eb1218e22820e (patch) | |
| tree | cad0c05bb22ba981c4234b2bc1e97a7b11beac76 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9cfe7babca0729845910b0568448c5006ee78478 (diff) | |
| parent | 0cd1fdd6170b3200ffbd6bc9f7b57d3ccb7d7b28 (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: 0cd1fdd617
Change-Id: I3833c1c3d6e4f56cdc68e44b606fcbeede4465e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions