OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FIN...
authorWei Liu <luciferleo@google.com>
Thu, 4 Feb 2016 18:15:26 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Feb 2016 18:15:26 +0000 (18:15 +0000)
commit7007254630ef6e8d236bcc2b548a08f34e443061
tree8200648fc6767908f668f2a7fa076eb13eb1c1d3
parent7cbc1aeecdb41076e26c2aa70bdc971ddb294e21
parent1886efacfc22aff9e191cd57820c2d151bac66e3
Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e  -s ours am: 4577aac551  -s ours
am: 1886efacfc  -s ours

* commit '1886efacfc22aff9e191cd57820c2d151bac66e3':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.