am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev

* commit '04f31501602a87ae9526983f4a92e623b4d68bb3':
  Change build version from KEY_LIME_PIE to KITKAT
This commit is contained in:
Chet Haase
2013-09-05 10:13:34 -07:00
committed by Android Git Automerger
16 changed files with 35 additions and 37 deletions

View File

@@ -56,7 +56,7 @@ public class BitmapFactory {
* mutable even when decoding a resource which would normally result in
* an immutable bitmap.</p>
*
* <p>As of {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, any
* <p>As of {@link android.os.Build.VERSION_CODES#KITKAT}, any
* mutable bitmap can be reused to decode any other bitmaps as long as
* the resulting {@link Bitmap#getByteCount() byte count} of the decoded
* bitmap is less than or equal to the {@link
@@ -64,7 +64,7 @@ public class BitmapFactory {
* bitmap. This can be because the intrinsic size is smaller, or its
* size post scaling (for density / sample size) is smaller.</p>
*
* <p>Prior to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}
* <p>Prior to {@link android.os.Build.VERSION_CODES#KITKAT}
* additional constraints apply: The image being decoded (whether as a
* resource or as a stream) must be in jpeg or png format. Only equal
* sized bitmaps are supported, with {@link #inSampleSize} set to 1.