OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06afac5 b2e34d3)
am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messa...
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 10:15:14 +0000 (10:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:15:14 +0000 (10:15 +0000)
* commit 'b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c':


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