diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-08-14 19:40:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-14 19:40:27 +0000 |
| commit | 9d85c1ff53a80c03cc05e644dd28a232ba052258 (patch) | |
| tree | f839974d5849e132f4473db67e11d108b0643126 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5315bbfbc7c3a922527c7f59fdb7a7671b505ab0 (diff) | |
| parent | ecde0c2a39f6f20bb6753ab2c6cac313ee46a541 (diff) | |
Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815 am: 9310c5bdd3 skipped: c565a7f7e2
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815 am: 9310c5bdd3
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions