merge cupcake into donut
tree: 68cc298836ed182c972e59f763689de634b78a48
  1. Android.mk
  2. googleclient-lib.jar