| commit | 06e31bc5019fe90a816657288c95840d5bd0b445 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Mon Sep 17 12:03:26 2018 -0700 |
| committer | Ryan Prichard <rprichard@google.com> | Mon Sep 17 12:03:26 2018 -0700 |
| tree | de86845e3fe131191fe9b5eaa4beb33fed04b32d | |
| parent | e646002bf0e5ec28e807e9ba8bebd3f4daf9a1e1 [diff] | |
| parent | d76261e04cce4245a3ea3f7b0e6d903d39631c49 [diff] |
Merge "Use feature flag in Settings." into master Merge commit 'd76261e04cce4245a3ea3f7b0e6d903d39631c49' into faster_emergency_feature_flag Manually merge this commit from pi-dev-plus-aosp to goog/master to resolve a merge conflict. Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I9b226742c5eaf8b933e273688bf4e22c650dec46