diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-07-10 15:06:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 15:06:30 +0000 |
| commit | 75a43340b675fd13eac05965438aaac2a7164658 (patch) | |
| tree | d89dd5dc86684a53a4728c3af69fab450d39df71 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 8ac76504feb4837ea524b2e62a0bd04c1e266d9a (diff) | |
| parent | 00c64f7ca5b05384dc3c208eff43e0b1a037a7d0 (diff) | |
am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions