OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d922f f661537)
am f6615376: (-s ours) am fdcd8216: Merge "MIDI package doc: add hasSystemFeature...
authorPhil Burk <philburk@google.com>
Thu, 27 Aug 2015 09:35:32 +0000 (09:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:35:32 +0000 (09:35 +0000)
* commit 'f66153764001b2fe29eefed7aadd2257e81fedea':


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