diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 00:25:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-07 00:25:17 +0000 |
| commit | a69fc7b2b875c56f210380e65b2fdc0ee25379fd (patch) | |
| tree | fc788ce19e78f2c46981c6178e7f2a00df1c171f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ab0cd1d315f91e1efe904d35b1066b3e57f04bec (diff) | |
| parent | 6103274aa4fd3e135b4862385f701508a20e070c (diff) | |
Merge changes from topic "am-d482e2bc81af4f58836648b9fccb5c89"
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: c6740a2382 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: f38a752863 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions