[automerger skipped] DO NOT MERGE
am: a11e5864bd  -s ours

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