diff options
| author | Shawn Willden <swillden@google.com> | 2015-07-29 05:20:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 05:20:13 +0000 |
| commit | 35d909c0d4e9ccfa3eefb5ca1f907c048513bacf (patch) | |
| tree | 227ad693ace6eb1d69defceabb2e4f64c5047fa5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7412dfe98daaf76377fc5d08e8b9bf994455b2a3 (diff) | |
| parent | 3f74023e028934c5a8d189c17f37009b95518374 (diff) | |
am 3f74023e: am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
* commit '3f74023e028934c5a8d189c17f37009b95518374':
Keymaster digest/padding NONE no longer means ANY.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions