diff options
author | Erik Kline <ek@google.com> | 2017-08-09 04:00:58 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-09 04:00:58 +0000 |
commit | 4a704d0a2851451a8b7bfd759509c1d3ace41c62 (patch) | |
tree | 8624184b94a94a3de93ac8ebb916c13f786bb33e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8ba767faf8328dbcac6bdc9d62e7194aa92b7537 (diff) | |
parent | 07df171ac67f8485aba04bf6394e93c203517408 (diff) |
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
am: 07df171ac6
Change-Id: I53115deda25ca83a00bd9de12891a72028647d12
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions