OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5511a49 ecd5f1c)
Merge commit 'f395e304' into m
authorConley Owens <cco3@android.com>
Mon, 2 May 2011 17:25:55 +0000 (10:25 -0700)
committerConley Owens <cco3@android.com>
Mon, 2 May 2011 17:25:55 +0000 (10:25 -0700)
Conflicts:
core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784


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