Merge "set sdk version to "Android 3.0" and api level to "Honeycomb"" into honeycomb