Android 2.3 CTS release 11
Merge "Update to tzdata2011n." into gingerbread