diff options
author | Jakub Pawlowski <jpawlowski@google.com> | 2017-08-18 00:59:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-18 00:59:32 +0000 |
commit | b970a5e931c0b73a892e2dd83620d75d59725c7b (patch) | |
tree | 00fec59e697c7115ac8e69cfb2ea6761f0bf3a4b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 390dcf2caddd617abcac8528a871fa0b8b1ef40e (diff) | |
parent | 4a5fd86da31b5f4f07262a01fc1f283fb04e154f (diff) |
Merge "Bluetooth: Fix startAdvertisingSet error handling" into oc-mr1-dev
am: 4a5fd86da3 -s ours
Change-Id: Ibc555af3fab84950c14a688a3a512d01408b24e5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions