add Webapp method and field

Change-Id: Id9dac821517aaec3cc241b70226add4892e09e95

Conflicts:

	framework.jar.out/smali/android/webkit/WebSettingsClassic.smali
	framework.jar.out/smali/android/webkit/WebViewClassic.smali
Merge branch 'jellybean' of github.com:Gerrett84/patchrom_n7000 into jellybean
add isMiWifi method to WifiManager

N/A

Change-Id: I0a6430c1a67d9c9a8b2abef441c5ef843370826a
Signed-off-by: mochangming <mochangming@xiaomi.com>

Conflicts:

	framework2.jar.out/smali/android/net/wifi/WifiStateMachine.smali