diff options
| author | Paul Hu <paulhu@google.com> | 2020-06-23 04:27:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 04:27:56 +0000 |
| commit | b68ef1f9c64ab58a0274b242af6142a625ff4ea7 (patch) | |
| tree | d55de5c0f3ec3c003fb7575a71727eb42a85b2ae /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 942fe47c5570509c5c24ba9184a3a9a6a1e710f9 (diff) | |
| parent | 78919990f8fa47aa57d92ce6d4d4a03c2a721a26 (diff) | |
[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: 51e93653f6 am: d4f78774fa -s ours am: 78919990f8 -s ours
am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 9743233ab1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325698
Change-Id: I50d2cd385165c00e3b21db4b489d4c3a776d16db
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions