diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 01:09:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-07 01:09:32 +0000 |
| commit | 1bfde096c3fe0b36208f0a491744dc716b92883c (patch) | |
| tree | d1aadebcdce7d64f3a21e6a84ab032dc7e8e577a /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 51271ba04a0f5340a9598d442695bcb668617c5d (diff) | |
| parent | d5366eb99c32f1ec1cd062a01069a7293cb518fe (diff) | |
Merge changes from topic "am-8fe1bfad79f84157a29ab2e38769dd1e" into rvc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: 2005c4ee01 -s ours am: da3fa364ca -s ours
[automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: 883e25f011 -s ours am: 6f4aadc779 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions