diff options
| author | Hector Dearman <hjd@google.com> | 2019-12-03 08:44:08 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-03 08:44:08 -0800 |
| commit | 19530a42f130a66166558f5afe54a65f10609409 (patch) | |
| tree | 4fa8bd9ecc750fbc328817a10b3e9e1b37bb3f8e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f807b4c364ac8d3abd2f371dd70eae4be399a465 (diff) | |
| parent | f11e43e171bcd8ddc347b16219c810800fedf978 (diff) | |
[automerger skipped] Merge "Revert "Add Perfetto upload logging atoms"" am: bab05b054d -s ours
am: f11e43e171 -s ours
am skip reason: change_id I8f41d72c8f96a004911ef68491de8a214da4db24 with SHA1 32a89c15a7 is in history
Change-Id: I2454a74ce85e588b4bbf3f3b642b005d034cb9ad
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions