am fb90df8c: Merge "Truthiness is good." into ics-mr1

* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
  Truthiness is good.
This commit is contained in:
Dianne Hackborn
2011-12-07 10:36:54 -08:00
committed by Android Git Automerger

View File

@@ -311,7 +311,7 @@ public class Build {
public static final int ICE_CREAM_SANDWICH = 14;
/**
* Android 4.1.
* Android 4.0.3.
*/
public static final int ICE_CREAM_SANDWICH_MR1 = 15;
}