OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 238789f 1b5cc3a)
am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Thu, 3 Sep 2015 19:08:58 +0000 (19:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Sep 2015 19:08:58 +0000 (19:08 +0000)
* commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52':
  Show face unlock even when fingerprint is running


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