| commit | cd589baba922f6b359ed910c3fbc711242c91531 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 17 21:11:56 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 17 21:07:42 2014 +0000 |
| tree | 0dc1ab4b2474e3d4de28c38880a003d35188d0b8 | |
| parent | 96401d99959afc2034a6b43580a93dae94da684a [diff] | |
| parent | a7596147b43940cad3f76c53ed154ef088b9269b [diff] |
Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts."