OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee0d069 e987d60)
am e987d609: (-s ours) am 26aa04c3: Fix state weirdness in the panel
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 09:30:47 +0000 (09:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:30:47 +0000 (09:30 +0000)
* commit 'e987d6099b43c305d2ee49b1160a31fd7cf609c2':


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