Merge "Correct typo in doc comment"

author Nick Kralevich <nnk@google.com>

Sat, 5 Jul 2014 16:57:45 +0000 (16:57 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 2 Jul 2014 20:52:43 +0000 (20:52 +0000)
author Nick Kralevich <nnk@google.com>
Sat, 5 Jul 2014 16:57:45 +0000 (16:57 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 2 Jul 2014 20:52:43 +0000 (20:52 +0000)
diff --cc graphics/java/android/graphics/BitmapFactory.java
Simple merge
author	Nick Kralevich <nnk@google.com>
	Sat, 5 Jul 2014 16:57:45 +0000 (16:57 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 2 Jul 2014 20:52:43 +0000 (20:52 +0000)