am 8b22ef66: am e41d2aed: Merge "Using robust equality check."

author Conley Owens <cco3@android.com>

Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)
author Conley Owens <cco3@android.com>
Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)
diff --cc core/java/android/text/Layout.java

index 1e4cca9,b62aa40..4107c5a

mode 100644,100755..100644
--- 1/core/java/android/text/Layout.java
--- 2/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
author	Conley Owens <cco3@android.com>
	Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 29 Apr 2011 21:56:15 +0000 (14:56 -0700)