diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-19 23:07:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-19 23:07:34 +0000 |
| commit | f48be6d7fa8409de355104a1846c6f30b5be65ec (patch) | |
| tree | bdf74338d21d30de7171d51a0d5da91485afaef7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f5da72021b1855cc6b6b5819b4611152fdc968c4 (diff) | |
| parent | 84a378f256bf7925ceb5d2c039a033d3e59b75df (diff) | |
am 84a378f2: Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev
* commit '84a378f256bf7925ceb5d2c039a033d3e59b75df':
Fix a bug in Android Keystore updateAAD.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions