Merge "Fix Settings crash on non face service support devices am: e85d588904
am: f018643563"
This commit is contained in:
committed by
Android (Google) Code Review
commit
2c0e88e981