tree ddf33633c878e4d4de06bb08c5e34f009e4e0efd
parent 5258321fd13185afb531772478912d14b6b64cd9
parent 6c92fd9e217de346aefd5ecdda6f37d556685745
author Santos Cordon <santoscordon@google.com> 1412960250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412960250 +0000

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

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