OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cbc1ae 1886efa)
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)
am: 1886efacfc  -s ours

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


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help