am 1d815272: am 58c27e3e: am c0ce6c42: Merge "Reduce risk of memory corruption due...

author Hans Boehm <hboehm@google.com>

Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)

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

Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)
author Hans Boehm <hboehm@google.com>
Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)
diff --cc graphics/java/android/graphics/NinePatch.java
Simple merge
diff --cc graphics/java/android/graphics/Paint.java
Simple merge
diff --cc graphics/java/android/graphics/Path.java
Simple merge
author	Hans Boehm <hboehm@google.com>
	Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)
		1	2
graphics/java/android/graphics/NinePatch.java	patch \|	diff1 \|	diff2 \|	blob \| history
graphics/java/android/graphics/Paint.java	patch \|	diff1 \|	diff2 \|	blob \| history
graphics/java/android/graphics/Path.java	patch \|	diff1 \|	diff2 \|	blob \| history