diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-07 18:06:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 18:06:48 +0000 |
| commit | 15a576d66e7326b47acc9bd311ea1abbba6deaec (patch) | |
| tree | daf49070c5785a0b3484ada1d2b7dd1b40bec505 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c3658d1b94b800713938c5896e76ce9a14097e26 (diff) | |
| parent | 46337ff149e977c2fa4d30855cc33c476b7dc4ef (diff) | |
[automerger skipped] Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea am: 8a027191d2 am: 875cba236d -s ours am: 46337ff149 -s ours
am skip reason: Change-Id I6cd17ac588a4d95bf0ea704dd18387e19eeab374 with SHA-1 4c789e0168 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496
Change-Id: Id299fb97949149ccb1e44ab2711ae36c9f23a1e8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions