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

am skip reason: Change-Id Ida58f2c362f40266e64700d2695d9798d2a08a8c with SHA-1 612c6ec701 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2043693baac049f211d276766caa6061ad4299df
tree: c66158cd6bc0524a6d78545623a217ef48d7ed66
  1. bin/
  2. java/
  3. proto/
  4. python/
  5. Android.bp
  6. main.sh
  7. OWNERS
  8. README