Introduce new API version to avoid breakage with the Froyo APIs;
introduce padding in the resources to avoid cross-branch merge pain.

Change-Id: I9975f4320dfc625e3ed68dfdbbe94cc0c3b019f4
3 files changed