am 4cc5d6f5: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.

* commit '4cc5d6f5fb85c30d2574e7bc9177caa35698ba16':
tree: 8339538e204f27ac9d701cda10bcaebb98edf49d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml