[automerger skipped] Do not clear Wifi country code upon entering airplane mode am: d1197599eb
am: bc26413cc4 -s ours
am skip reason: change_id I80ab05bed795453077fc1d9d476d91fda1db5ddf with SHA1 e2b621902f is in history

Change-Id: I24e0adf6dcdf1e4326b1c61cde77cd330fee41e5
tree: 8452d078b3bae701960ce6f4183846edb628fa61
  1. service/
  2. PREUPLOAD.cfg