diff options
| author | Ian Kasprzak <iankaz@google.com> | 2019-08-28 20:29:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 20:29:40 -0700 |
| commit | 2b7053a0bd76d2b93e292d60d293c6719ac53185 (patch) | |
| tree | 3a39b5123e081645b007cbbafa890cf0861cf5e6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 65d8b4afc79d3d1a333ea1ed85405390803167a1 (diff) | |
| parent | 489edfda2093cdbafc57f78c146eb1218e22820e (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
am: 489edfda20
Change-Id: Iee819080ed09d2136c0f7467be770e0e5a36437f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions