tree 0dc1ab4b2474e3d4de28c38880a003d35188d0b8
parent 96401d99959afc2034a6b43580a93dae94da684a
parent a7596147b43940cad3f76c53ed154ef088b9269b
author Jim Miller <jaggies@google.com> 1403039516 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403039262 +0000

Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts."