tree 1ee7c8831b503757a182b816e38c78a68aa730ba
parent e3bb0810f71feef623d3a9f94f8c42d2f3532748
parent 024b5e64777c9ce79ba1ef18eb36f0310e024a11
author Ryan Savitski <rsavitski@google.com> 1559921415 -0700
committer android-build-merger <android-build-merger@google.com> 1559921415 -0700

[automerger skipped] Merge "incident report args: add setter stubs & constant aliases" am: cdcd19f560
am: 024b5e6477 -s ours
am skip reason: change_id Ieaf5b3b4d67168e2a99ff54e6392c77d8372ed4e with SHA1 a8e78b9b88 is in history

Change-Id: I4ef0aeef07b6d95c845f53a6c306c13d862c6378