OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eed809f bb5b3ca)
am bb5b3ca2: (-s ours) am 494d6e9b: [fingerprint] use credential owner in Fingerprint...
authorAndres Morales <anmorales@google.com>
Thu, 27 Aug 2015 10:18:13 +0000 (10:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:18:13 +0000 (10:18 +0000)
* commit 'bb5b3ca25080ba3c7fd4a3942646efb15265e441':


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