diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-13 20:39:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-13 20:39:58 +0000 |
| commit | b2a175fed87cbe2d4bccd5ea33b14135b0d622ff (patch) | |
| tree | 74626b5a14887abe895f262fd842db8991a1a212 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 43b5e882c2942169934684f6395743764c93ac97 (diff) | |
| parent | a54fe6e8d09a9856b59d599fbf7f2806dca59621 (diff) | |
[automerger skipped] Merge "Make NtpTrustedTime safer / expand docs" am: 49c903a0d2 am: 0330b350e4 am: a54fe6e8d0 -s ours
am skip reason: Change-Id Ie09da9db5d853b59829886a020de21a88da5dd51 with SHA-1 65f0f31bde is in history
Change-Id: Ia34911cc0f3e2a2fcaf3c48177c3f70a938c75b0
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions