diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 04:57:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 04:57:24 +0000 |
| commit | 7bf87bda4c24f07ecafd1eec8dc3ef6c44cb1ea3 (patch) | |
| tree | f332d86f5bb6efe3696cfe745b1daa2e18fa4aab /rs/java/android/renderscript/Script.java | |
| parent | f9ace3f8aa518290ae20aef152b1ee5d1820123b (diff) | |
| parent | a6110193f8946a812f48929e89efc349b29dca95 (diff) | |
[automerger skipped] Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." am: 9bda007cb8 am: a881005317 am: a6110193f8 -s ours
am skip reason: Change-Id I6225f100953a2ad354acaa261a774989926393ce with SHA-1 d75f97d21e is in history
Change-Id: I38d6107ce6da86d5fb9d53c3dbcdb7f7293b17e2
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions