diff options
| author | Hector Dearman <hjd@google.com> | 2019-11-19 16:28:59 +0000 |
|---|---|---|
| committer | Hector Dearman <hjd@google.com> | 2019-12-03 15:01:33 +0000 |
| commit | 8d4a16cfc6fd7bad916c41faea3740290e182d51 (patch) | |
| tree | f7b92f0766220e8021ca72eb2de94169432b95ec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 38b8b858a7ef488f3872654de85e16018e09b5e7 (diff) | |
Reland Perfetto upload logging atoms DO NOT MERGE
Initial state:
- I landed ag/9652310 (the original change) downstream
- I cherry-picked this change on upstream to aosp/1158971
- This cherry-pick had an incorrect Merged-In tag referring to ag/7911242
- This cl was present between mirror-aosp-master and master internally
Branch CL
aosp/master (aosp/1158971)
\/
internal/mirror-aosp-master (aosp/1158971)
\/
internal/[---] Nothing since ag/7911242 was here
|| already automerger skipped our change
\/
internal/master (ag/9652310)
\/
[various children] (ag/9652310)
See:
https://android-build.googleplex.com/builds/automerger/graph/project/googleplex-android/platform/frameworks/base
How this will fix the issue:
- The revert will go everywhere aosp/1158971 did
- The reland will go everywhere aosp/1158971 did plus to internal/master
This reverts commit 8ed72df3d8e21c06d8b1b848d6e58c15b251d25a.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions