[automerger skipped] Mark ab/7061308 as merged in stage. am: f5d505f0e2 -s ours am: 454deb6086 -s ours

am skip reason: Change-Id Ia6c0b731fca112b9fba547ec8cef96b9d3e620db with SHA-1 805fac8a85 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c6520ca8909b703c32e0e94368cbeb8a2280356
tree: 85592d62cf3b64b3fe5a09da799c03879057fe7f
  1. include/
  2. src/
  3. Android.mk
  4. gen-buildcfg.sh
  5. METADATA
  6. OWNERS
  7. vnd_buildcfg.mk