[automerger skipped] Merge "Log UserspaceRebootReported atom from system_server" am: 9b6f6674eb am: 861a15b047 am: 0ffc4aee18 -s ours
am skip reason: Change-Id Ib9e2c6cef7094ccac7862be249d619212f0013fd with SHA-1 0ff27211a0 is in history

Change-Id: I1b8f8ae273b67d5a376c41665f8bc44c412b523f
tree: b626acc7bf2975595f2417d87fa4036337999b63
  1. atom_field_options.proto
  2. atoms.proto