summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-09-09 11:56:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-09 11:56:11 -0700
commita78eca95ff54989c280405b70d143b0909854409 (patch)
treebbe32512ad9b640ad7c9d230b4128ce05d17d316 /graphics/java
parenta5682df238e492a82fbc5bc384dcc5ec9b707e08 (diff)
parent6e1df0e981c8c588e411b8ad6e55554fe4815655 (diff)
downloadframeworks_base-a78eca95ff54989c280405b70d143b0909854409.zip
frameworks_base-a78eca95ff54989c280405b70d143b0909854409.tar.gz
frameworks_base-a78eca95ff54989c280405b70d143b0909854409.tar.bz2
Merge "Progress Dialog documentation example uses onPrepareDialog"
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/BitmapFactory.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 5dbbd70..dc21a72 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -83,7 +83,7 @@ public class BitmapFactory {
/**
* The pixel density to use for the bitmap. This will always result
* in the returned bitmap having a density set for it (see
- * {@link Bitmap#setDensity(int) Bitmap.setDensity(int))}. In addition,
+ * {@link Bitmap#setDensity(int) Bitmap.setDensity(int)}). In addition,
* if {@link #inScaled} is set (which it is by default} and this
* density does not match {@link #inTargetDensity}, then the bitmap
* will be scaled to the target density before being returned.