tree ea2e911fd69b4d68bb28eaa96f81d7b83173c585
parent a31b3f2650dedf3cac596ed4763466ec605303e8
parent f395e3042accd7f3f5df466dbb532befcd1db5d4
author Conley Owens <cco3@android.com> 1304357155 -0700
committer Conley Owens <cco3@android.com> 1304357155 -0700

Merge commit 'f395e304' into m

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

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784