OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 521fea4 5eedef9)
am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d...
authorAndreas Gampe <agampe@google.com>
Thu, 30 Apr 2015 18:29:35 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 18:29:35 +0000 (18:29 +0000)
* commit '5eedef96d9408cdb78b5a28878bf1013cc11f8d3':
  am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp


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