tree a267990f5b3ed2f128e7509ab4d234f31ad34ec2
parent 789419cf5109b011664f3806da72a1e27780b154
parent c375505b8bdab990b350391b0a57b41f011d888f
author tmfang <tmfang@google.com> 1564024069 -0700
committer android-build-merger <android-build-merger@google.com> 1564024069 -0700

Merge "Add tmfang as a owner of settings_enums.proto" am: ca33485de9
am: c375505b8b

Change-Id: Ibca5db46aef6c2faa66e2aff325861e64192c6bc