OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91ae6b1 8d0c89a)
am 8d0c89ad: Merge "resolved conflicts for merge of 4f342e87 to master"
authorJeff Tinker <jtinker@google.com>
Fri, 4 Apr 2014 01:54:21 +0000 (01:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 01:54:21 +0000 (01:54 +0000)
* commit '8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a':
  resolved conflicts for merge of 4f342e87 to master


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