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

am skip reason: Change-Id Id1fcb9b1808a1c769addd79dc1ba972d67407ec1 with SHA-1 fed02fe9c8 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3d315bac4e04f0eedbbdff31d1c0950c0744f1e
tree: 95f00332886fc754a822b3aff23259761aab7cc6
  1. Android.bp
  2. boot_control.cpp
  3. METADATA
  4. NOTICE