OSDN Git Service

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)
commit4c30f1027ab564d64a2efc5812dc5806be6ed8cb
treed6fc0766f7c994bf1450c2a02bc25289525a900a
parent5511a49d8df4020b714a3673b4d3d1de00470da2
parentecd5f1cc409489273d386f04fc32038d3b389d75
Merge commit 'f395e304' into m

Conflicts:
core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784