OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02bffbf 6dc2ac3)
am 6dc2ac39: (-s ours) am 9d929558: Merge "Correctly skip files that are excluded...
authorMatthew Williams <mjwilliams@google.com>
Thu, 27 Aug 2015 10:11:24 +0000 (10:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:11:24 +0000 (10:11 +0000)
* commit '6dc2ac39e5913ceb5348d2e1e41af0ac95f59592':


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