[automerger skipped] DO NOT MERGE am: a11e5864bd  -s ours am: 1258a5b4be  -s ours
am: 7d02115db0  -s ours

Change-Id: I5cfe9fc2fe6547c1814b8496660f51ccb24f4f57
tree: dce3549ef213a4ef14cbb99c2975627e4719749e
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. proguard.cfg
  6. README