diff options
| author | Robin Lee <rgl@google.com> | 2015-07-10 19:32:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 19:32:40 +0000 |
| commit | 51cfb3a4d6f59824ba503a0e7f0190e08ede8621 (patch) | |
| tree | dfacececd6fa4543ec91e7a642af8f9ec35c82c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dbcd049ac89878b7416d8325eba39c90000f8bb8 (diff) | |
| parent | 2164cf4f4043b4892db5688ed53624af758fcdaa (diff) | |
am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
Legacy VPN calls to require a userID
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions