am 5849606d: merge from open-source master

Merge commit '5849606df71fb3d5ce88b966cff8382deccd56b6' into kraken

* commit '5849606df71fb3d5ce88b966cff8382deccd56b6':
  Fix typos in comment.
  CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
This commit is contained in:
The Android Open Source Project
2010-03-29 11:10:32 -07:00
committed by Android Git Automerger

View File

@@ -30,7 +30,8 @@ import java.util.Locale;
* (green << 8) | blue. Each component ranges between 0..255 with 0
* meaning no contribution for that component, and 255 meaning 100%
* contribution. Thus opaque-black would be 0xFF000000 (100% opaque but
* no contributes from red, gree, blue, and opaque-white would be 0xFFFFFFFF
* no contributions from red, green, or blue), and opaque-white would be
* 0xFFFFFFFF
*/
public class Color {
public static final int BLACK = 0xFF000000;