tree 0789f13c696fef83886f313628ba4ef424befe9a
parent f1188efefed8faf7c958a711ea2bf7d3ac6009fc
parent 95d6b6747e7c856dcdefdb58a7c0efdcce7b2d10
author Fan Zhang <zhfan@google.com> 1610008106 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1610008106 +0000

Merge "Add an emergency category to settings injectable mappings"