OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29abbd0 a2660d0)
am a2660d09: am a950fe0a: (-s ours) am 120fc2c7: Merge "Disable fingerprint when...
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 19:33:07 +0000 (19:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:33:07 +0000 (19:33 +0000)
* commit 'a2660d09221c72967fb8b0e07d01c0dfdb052f37':


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