diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 12:41:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 12:41:59 -0700 |
| commit | bf0e0a04dd3d56b1c0cd73bbf99312a9a72b2642 (patch) | |
| tree | 97de2eb6c6a4e67bc977cb6c191191112cee28bb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | ad8680bfcbd6c2c2d0039d3b99467d13749fe4a7 (diff) | |
| parent | 1a3f859c78bd05c5f73335a620e253d7f2548294 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev am: 97111a1cb6 -s ours
am: 1a3f859c78 -s ours
am skip reason: subject contains skip directive
Change-Id: I7c869cb79734200a9bf797db5babac76e3d4971c
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions