diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-07 22:53:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 22:53:58 +0000 |
| commit | 1075a27c69ca9d6aae9337d8ad6a52460588b9cc (patch) | |
| tree | 0ceab2bd6bef5578f9fe0d727fa3b262f2193e3b /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 00c713fd379edca0f3b472f55bd5d315bad671fb (diff) | |
| parent | b5e3eba1665f0a5f42bcfc2630d67011edb70f05 (diff) | |
am b5e3eba1: Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev
* commit 'b5e3eba1665f0a5f42bcfc2630d67011edb70f05':
SystemUI/Keyguard: try authenticate finger after authentication failure
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions