am 26a19b24: (-s ours) am 6292bd70: am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '26a19b244b797b825575f0851e16e2b2ad5dc174':
am 2f023193: Accumulative patch from commit f46fc73a3f8d0eeb1b43d17769464884f467ac47

* commit '2f023193a0fd630eb82ce6381b80911ad5a3462f':
  Accumulative patch from commit f46fc73a3f8d0eeb1b43d17769464884f467ac47
am 700a137a: Accumulative patch from commit 565110cd554801fa301c55010b3e9e14f43d7973

* commit '700a137ab366edc72e371da68ba187b4717ee660':
  Accumulative patch from commit 565110cd554801fa301c55010b3e9e14f43d7973
am 37d4d6a4: Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0

* commit '37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90':
  Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0
am 0ccb66ed: Accumulative patch from commit ce26864e79144cba12d5ff98632570593cc57b8a

* commit '0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f':
  Accumulative patch from commit ce26864e79144cba12d5ff98632570593cc57b8a
am 444d567b: Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392

* commit '444d567b27731d8572ef37697dd12fd1c37c2f24':
  Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392
am 1e78e769: Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff

* commit '1e78e76961664775f58b139f8c6388cfa0485f3d':
  Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff
am 5bd30337: wpa_supplicant: Enable TDLS

* commit '5bd3033779d5e41840f1b8e240e5f7a8f54b429c':
  wpa_supplicant: Enable TDLS
am 07c8efbb: Revert 8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested

* commit '07c8efbbf7c11c96b15ce21425292ba7c07f35ab':
  Revert 8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested
am e93dd11e: Add liblog

* commit 'e93dd11e00aa3a511406648774f01db31304323a':
  Add liblog
P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.

Unblock the code under wpas_p2p_set_group_idle_timeout which was
blocked under ANDROID_P2P.The unblocked code is basically avoid
to set group idle timeout if the group is started.

Change-Id: I0bb134b014f932802da474ccdc20ceb1a086e87b
am 64f47c5c: wpa_supplicant: Add option -I for additional config file

* commit '64f47c5c24428834677459e048420f86e3514c20':
  wpa_supplicant: Add option -I for additional config file
am b9551352: wpa_supplicant: fix -I option handling

* commit 'b9551352f7b1af5c6e3ab7c07827db56651f6935':
  wpa_supplicant: fix -I option handling
am 97d98069: Revert "wpa_supplicant: fix -I option handling"

* commit '97d980693a6550ea7a66d85cf1f453b1246436b2':
  Revert "wpa_supplicant: fix -I option handling"
am 5d1c8ad1: wpa_supplicant: fix memory leak in -I option handling

* commit '5d1c8ad11de48ba5e449e83e1e5dcd844e9c35d1':
  wpa_supplicant: fix memory leak in -I option handling
Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."
am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '77979736ea5fe4448d77937df56d84d263436034':
  P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.
am 7d96eda0: am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '7d96eda062fd58d2ab28311bd0c8ab9193da4080':
  P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.
Accumulative patch from commit 97279d8d1ad40bd7d884af8e2fc26dff0163331a

97279d8 nl80211: Drop frame events that are for foreign address
cc2ada8 nl80211: Reduce debug on Probe Request frames
63a965c P2P: Fix after_scan_tx processing during ongoing operations
06b7f58 RSN: Update preauth scan results only based on new scan results
18e00b5 Move wpa_s freeing into wpa_supplicant_deinit_iface()
754632c dbus_new: Add EAP logon/logoff
c2aff6b hostapd: Add some testing options
adc96dc nl80211: Fix nla_nest_start conversion
0606052 wpa_supplicant: Add get_capability freq
c7a39ba Provide TLS alerts to CLI/UI over control interface
2a07a27 P2P: Increase GTK rekeying period to 24 hours
75fa7d1 TDLS: Fix key configuration with current mac80211
8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested

Change-Id: Ic4b568c341657d266b7759513230d4ef206d75b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Accumulative patch from commit b57b560034f1bb1ad3a3892228940dde97323c0e

b57b560 wpa_supplicant: Default to nl80211 instead of wext
ee28f08 hostapd: Add more messages for error paths
61d2ce2 hostapd: Reject configuration file without interface parameter
a8a7890 Clear extra_blacklist_count on FLUSH command
c646862 WPS ER: Allow UPnP interface to be forced
728d971 Use status code 17 (unable to handle new STA) on max-STA limitation
5e24dc8 Add dup_binstr() to help common binary string tasks
8b44ad7 Use os_zalloc() instead of os_malloc() + os_memset()
2c48211 FT RRB: Validate os_malloc() return value before using it
7ca902b Make vlan_file optional if dynamic_vlan is used
bdb112d Add bitfield routines
04382f7 NFC: Add no waiting and no multiple operations options for scripts
fe90496 WPS: Fix AP auto configuration on config token generation
28fcfb6 NFC: Increase wpa_cli command buffer size
8f7a6dd WPS NFC: Allow Device Password ID override for selected registrar
aaecb69 WPS: Use generic MAC Address attribute builder
9ccd916 P2P: Clean up channel--frequency conversion functions
e864c0a Use a common frequency to channel conversion function
02db75b FT: Reset FT flag upon STA deauthentication
7800d45 P2P: Set P2P_DEV_PEER_WAITING_RESPONSE from TX status callback
d78d3c6 EAP peer: Add check before calling getSessionId method
dd57970 Disable network temporarily on repeated connection failures

Change-Id: If8078d5c1ff40ea806e844543cf6f2bf9d24b7ac
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>