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

* commit 'afb167eb8e457ac8b3f815b5e26de0530508d962':
tree: 318f4b618c2ccf5d7c3a229751c1916f844407c9
  1. res/
  2. src/
  3. .gitignore
  4. Android.mk
  5. AndroidManifest.xml
  6. project.properties