[automerger skipped] Mark ab/7061308 as merged in stage. am: 746c0a691a -s ours am: 7db52e7f36 -s ours

am skip reason: Change-Id I449496e24ddbb70e848a97b9f26bda5859a9a9db with SHA-1 ed1bb52ae1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I552af6db906600c41c9a1e638bbf821356253e0b
tree: 0a199e02e00b0e145bac2f3acbf9c282c8ca76b6
  1. staticlibs/