diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 06:44:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 06:44:30 +0000 |
| commit | 693a492cfca1312bc32306b01f412c3176eab599 (patch) | |
| tree | b4b3b1cca8331125e8583f21d85282752d74af0c /rs/java/android/renderscript/Program.java | |
| parent | 87b757beac0781516356a59fdabba77ac90d1c10 (diff) | |
| parent | e977504e7aeb6beca522d8b3bfc82028755bc93f (diff) | |
[automerger skipped] Merge "Add an override for getUser in ContextWrapper" am: 5a049f5cf2 am: 5d9fc9340b am: e977504e7a -s ours
am skip reason: Change-Id I2d24f5141e8cbc2546c8dc5894a1aeab376b7632 with SHA-1 b7eb15dfa8 is in history
Change-Id: I587f284e7b8265060dcef1f16abfc4d833145c9b
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions