diff options
| author | Brad Ebinger <breadley@google.com> | 2019-07-12 14:40:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-12 14:40:54 -0700 |
| commit | e02370196f245ca4c1a73836f1426db2aef0959d (patch) | |
| tree | a0f105424e39f3c467e2f857e08ff48167372e4f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | afa4db86872f838d78ebecdb5d7521797d6c697c (diff) | |
| parent | 5b5889fc63f8085e0aed7d16e7d7c2259a0d6477 (diff) | |
[automerger skipped] Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount"
am: 5b5889fc63 -s ours
am skip reason: change_id If70d917cfb3d825f375d282012b8788d69a2f144 with SHA1 499881f1da is in history
Change-Id: I8fdd1801c2e9db63daee78dcbe2c309ddbbe5f46
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions