diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 16:11:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 16:11:56 +0000 |
| commit | de18f683aef6457697d8eb3af2191e27270b3783 (patch) | |
| tree | f12bfa15708d3703e80497eb2baddc337f88f242 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 248783b4d6a06cc2c1d719a6b3df664674984d36 (diff) | |
| parent | 918f2fa054e5cb3f1df6d77a23c0c90643ec4801 (diff) | |
Merge changes from topic "am-0d6635f2dd8242f6b08d688b740a2491" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-f59e5e992a2d448d8991d0ff384a3aa2" into rvc-d1-dev-plus-aosp am: c0e6d6d772
Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 691e4c6427 am: 0b5cbc733d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions