diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 03:36:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-05 03:36:58 +0000 |
| commit | 1772e0bee4c0af048b24b17726f08d7c7bb61078 (patch) | |
| tree | 5d036e8195ea2b52c4f678d904fd4c1d87f8d618 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e33d6e932a5a8cd3b23320539bdf56c838de779a (diff) | |
| parent | 93d58a1d454e5f28d73a6774b0a32540394633e8 (diff) | |
Merge changes from topic "am-b75f7374546b417da72660e8f4bd16ae" into rvc-dev-plus-aosp
* changes:
Merge "Add test for activity leaks" into rvc-dev am: 1c5d9ed8ff
Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a761
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions