Merge "Block modification to ID and package name" into oc-dev
am: 3be230a48b

Change-Id: Ia1479270eab980b4d43a4b3a4a7ed8274e41bc5e
tree: 4600885a12bbeedbbd4db667ddd62e248326913c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml