tree f347374cbf726d11782c1156835780d297f39edc
parent 1a6f9baee03159957b3abe2ac68f3f8bb9572faf
parent 49f886cf3e9fc90abfa0d14455dcfc7585c9d528
author Santos Cordon <santoscordon@google.com> 1412966530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412966530 +0000

am 49f886cf: am 6c92fd9e: am 3655c45d: am 1d7dfdab: Merge "Add config: Don\'t start HFA if outside of setup wizard." into lmp-dev

* commit '49f886cf3e9fc90abfa0d14455dcfc7585c9d528':
  Add config: Don't start HFA if outside of setup wizard.