Merge "Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev am: 2c645247e4
am: e277797349

Change-Id: I64573c249360d5598315952ebca10b3641ba3f6f
tree: 85ece6bc1dcf4b32446e5d8ef8c66a0c3e70a08c
  1. service/
  2. PREUPLOAD.cfg