OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9736c5c 47c5338)
am 47c5338b: (-s ours) am 968fc3ab: Merge "Fix deadlock." into mnc-dev
authorCarlos Valdivia <carlosvaldivia@google.com>
Thu, 27 Aug 2015 10:18:56 +0000 (10:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:18:56 +0000 (10:18 +0000)
* commit '47c5338bc33b69ecbe4cfd719735112ef30f0521':


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