Merge "Use long for ids"
tree: 912f1147e6f9b651e0fd781fea078599a6e61089
  1. res/
  2. src/
  3. Android.mk