diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2015-07-31 03:17:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 03:17:55 +0000 |
| commit | 058fbd0fef35e62d2baf3e58b7a0c2f24b155dff (patch) | |
| tree | 3ef5ef47a46b872f2b478c7c93486f86988c4fad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8e717629958b0f18833fc0de07edca181a14419b (diff) | |
| parent | 4581ca5308fde9e7a0aafc7bda6fe3cd878efc22 (diff) | |
am 4581ca53: am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '4581ca5308fde9e7a0aafc7bda6fe3cd878efc22':
Revise lockdown check in getLegacyVpnInfo()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions