diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-09-15 00:59:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-15 00:59:56 +0000 |
| commit | 26a5e89adade912873e15ccc7c19f9e4492fa4be (patch) | |
| tree | db69495af5f533fce92662f2e2ecfe675962e639 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 229a0718ff31bf83521e3a774485bb48573987f7 (diff) | |
| parent | 7d446ed13e027e768fd5e17194127edc880fbc0d (diff) | |
Merge changes from topic "am-3eec4170e5bb462f97652e0423a9e02d"
* changes:
Merge "libandroid_runtime: Link libselinux dynamically instead of statically." am: 6d66e03371 am: 10f56a4f76 am: cc85f456ca
Merge "libandroid_runtime: Link libselinux dynamically instead of statically." am: 6d66e03371 am: 09c9e38608
libandroid_runtime: Link libselinux dynamically instead of statically. am: d7e42641de am: 73ce15e8a8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions