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