Merge "framework/base: Do not kill the supplicant on a request to stop it" into kitkat
Merge "P2P : Flush P2P scan results on group fomation failed event" into kitkat
framework/base: Do not kill the supplicant on a request to stop it

Supplicant is killed on obtaining the first TERMINATE event when
requested to stop from the framework. This shall result in improper
shutdown of the supplicant without proper cleanup of the resources
allocated for all the interfaces.
Moreover, there is no point in killing the supplicant when the
request itself is to to stop the same. Thus, do not kill the
supplicant on the TERMINATE event.

Change-Id: I954bb09faa94252eea53a14b090a6cff610c5964
CRs-Fixed: 601759
P2P : Flush P2P scan results on group fomation failed event

P2P group fomation failed event removes the target device entry
from peers list in framework.If Group negotiation request comes
from supplicant, framework will drop request due to entry removal
in peers list.
To handle this situation, framework has to send P2P flush command upon
device entry removal, so that supplicant and framework will be in sync
with device information.

Change-Id: I738ea50706d337bcc7e33d07bac53aa26b18ca7a
CRs-Fixed: 610632
[video] : added mime-type for mov files

- Added video/quicktime mime type for mov files in
  MediaFiles.Depend on the mime-type it decides
  to show either in gallery or music app

CRs-fixed: 515036

Change-Id: Ieab6c15d78d2d140158833905e8e387643f1157a
Merge "[video] : added mime-type for mov files" into kitkat