diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 09:38:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 09:38:29 +0000 |
| commit | 65f107721ba3167c884e76d7220e1ec4ab97cf51 (patch) | |
| tree | 8fa3351c286284968f86410f3e7cc22b28c12be0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3ac0f19a6a81b06bbd6ca1bcdb13bde6f26c396f (diff) | |
| parent | aa58c0d5c3a8620ad29fafb101d90df6e8846e83 (diff) | |
[automerger skipped] Merge "Rename android.util.TimestampedValue to android.os" am: 641fa6730a am: fee904a5fb am: aa58c0d5c3 -s ours
am skip reason: Change-Id I4b84db03c8ad24bbef63e45d6d15fb306a10364e with SHA-1 d159015e54 is in history
Change-Id: Ia0df0d190d348802d872e4625ec6c761d5b2697c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions