am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread

* commit 'aa1fd70100d1af393c8d4ebe9cb36a8fa15a3633':
  Move Wifi Ap configuration to flat file