OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa110b3 fbdd8b5)
am fbdd8b59: am 0c152b9e: (-s ours) am 30c5da9c: Don\'t call cancel() when fingerprin...
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 19:01:36 +0000 (19:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:01:36 +0000 (19:01 +0000)
* commit 'fbdd8b59dc7f7c12c967d89c1ac3a2273d566f24':


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