diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-03-22 08:56:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-22 08:56:21 +0000 |
| commit | 17eb43f4964089bbcc443b5a70f67b1abb081074 (patch) | |
| tree | de2e10b840164c06cd368cf7e9db5edd62c404e8 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7ae4fa36d44aee82ad2145235824cfd5bfbcf96d (diff) | |
| parent | 123b8d34b79f4dba044acad10989ed32fc6d473b (diff) | |
[automerger skipped] Merge "Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth SystemApis and for hidden connect/disconnect APIs." am: c1cae420a2 am: 123b8d34b7 -s ours
am skip reason: Change-Id I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a with SHA-1 2c71d16ced is in history
Change-Id: If4d5d4de6f693ff9426006f1f5209e0ca6afb522
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions