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