pulled in android-omap-3.0 branch from omap

master was empty, so I pulled in android-omap-3.0 instead