diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-02 20:44:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 20:44:00 +0000 |
commit | e268e877c651a0a7fcc5f321185699257f30eaf4 (patch) | |
tree | 16a26dd84e7e11a32b1b8c0b0502fb62a47ead0c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6dd910c7269808c62d0aa08648e0be4ced778c69 (diff) | |
parent | 1762e316426199f16d5d87a7eddbb6cffb7efb6e (diff) |
Merge "Move OemNetworkPreferences aidl to connectivity" am: 2e03331755 am: 1762e31642
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions