OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d329fa0 c8cb059)
Merge commit 'c8cb059f' into manualmerge
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 17 Jul 2012 23:55:22 +0000 (16:55 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Tue, 17 Jul 2012 23:55:22 +0000 (16:55 -0700)
Conflicts:
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java


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