OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48f73ef d445fe7)
Merge "resolved conflicts for merge of cbe69ec1 to master"
authorGriff Hazen <griff@google.com>
Tue, 20 May 2014 23:59:45 +0000 (23:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 May 2014 23:59:45 +0000 (23:59 +0000)
1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help