Jim Miller 0feaaafd7a Merge "Prepare to make Fingerprint API public."

2015-04-02 03:09:39 +00:00

..

java

Merge "Prepare to make Fingerprint API public."

2015-04-02 03:09:39 +00:00

jni

Prepare to make Fingerprint API public.

2015-04-01 19:20:08 -07:00

res

Merge changes from topic 'mwd-merge-040115'

2015-04-02 03:08:02 +00:00

tests

resolved conflicts for merge of 261e7a37 to master

2015-04-01 18:23:27 -07:00