diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 23:21:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 23:21:15 +0000 |
| commit | 2c20c4f07bbccd08653d477eeb25ff9d7e7853cd (patch) | |
| tree | 2de46fdd92193603b8863576d1449e90b63d6d1e /rs/java/android/renderscript/Program.java | |
| parent | c86f5d7b0fa0f9c8110058e5f554753c31d141df (diff) | |
| parent | aa4870096c2652c869000eae778c9e24a95bad3f (diff) | |
[automerger skipped] Merge "Add IntDef annotation to SIM state constants." am: 7339d1743c am: 6ad53af775 am: aa4870096c -s ours
am skip reason: Change-Id Ife159922b8b0fdf84ea376f32ac1d9156c9802d3 with SHA-1 c9129642ad is in history
Change-Id: I640cf0dc9c7a6f5bcc7f9690b5b328ddf3936b6f
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions