diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-05-01 16:30:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-01 16:30:49 -0700 |
| commit | 870450a7ec676d534758672843ffbf4ef4b8163a (patch) | |
| tree | d2770bee0788c5f5a2c0171f7e7c85388b6660e9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b7913742e83fb7a5809fcbd40e105957b7d5b467 (diff) | |
| parent | 9cdbb1a98102e1e93b7118fe4c91a88951523436 (diff) | |
[automerger skipped] Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM." am: d3daa7a40e
am: 9cdbb1a981 -s ours
am skip reason: change_id Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34 with SHA1 aed2152839 is in history
Change-Id: I0139dca9aeeca91d0ee1698e918854364c70db27
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions