Merge "Update for Allocation API changes."
tree: 40a41a9fb7132fd41ab371f02478f2690ace6481
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml