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