Merge "Remove device whitelisting and hardcoded constants am: 9736d0f303 am: 8ca0af841b" into nyc-mr1-dev-plus-aosp
tree: 2e7e78af4f418845d507826fe5b0db764c7f8d1c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml