[automerger skipped] Mark ab/7061308 as merged in stage. am: 11f7022d0d -s ours am: 8b3897db1f -s ours

am skip reason: Change-Id I026e0a5219bc2dbf35cba80e09176eaefc1aa67b with SHA-1 ef2d216ffc is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I360a5ee10b541c06cbcde2891a86746b20a9e099
tree: 1848c56ab7171d9e1a34c320af5d30e9536fa6fb
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags