Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into HEAD
Swap volume buttons when the screen is rotated (1/2)

See: http://review.cyanogenmod.org/#/c/14530/

Patch Set 8: Invert the orientation interpretations on tablets

Change-Id: I201febc2827e6fbd347cb0e3f8d3347ad1bc487b
Fix resource leak: When call MediaMetadataRetriever.setDataSource or getFrameAtTime should ensure call release in finally to avoid resource leak
                   Patch set 2: Remove unnecessary white spaces

Change-Id: I49a7f2fb99dc8b9560e7c17421125356e45a87ac
[HTML5] Implementation of WebSockets (framework).

Added binding to android port for Html5 WebSockets.
Added external API for enabling\disabling from browser.
SSL Web Sockets are not implemented in the current version.

Change-Id: I8b7a42780410cb9f043e1f16570ea50db68e00ea
Revert "makefile changes for gcm javadocs"

We don't build it, nor do we have these sources.

This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e.

Change-Id: I877e617f90de1b832e26c98adbafc6238b98882f
Add keymapping for select BT headsets

Per CYAN-522, select BT headsets (e.g. Jabra Street, Jabra BT3030, etc)
send key 159 for fast-forward button, instead of the expected key 208.

Need's testing with affected BT devices.

Change-Id: I06ba689f77dd1058fb82b1de9f72b4df59150cf9
Lockscreen: Fix mdpi layout issues

Before: http://i.imgur.com/gXNUt97.png
After: http://i.imgur.com/ppevA6M.png

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I5bc893f12096d288d04d7cfa442b471002178a3a
Prevent Sym key from showing the IME picker

By default InputMethodManager will popup an IME picker when pressing
the Sym key.

This can be disabled by setting config_symKeyShowsImePicker to false in the
overlay (so the Sym key will show the symbol windows selector for ex.)

Ported from jellybean (was Change-Id: Id61e2d1d66babbb5bd15d7dcf280c1cb76bced46)
http://review.cyanogenmod.org/25787

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I5ee2542c081dca14d2e22724cc2616519716dd45
Wifi: Enable Ad-Hoc (IBSS) network configuration

This adds two public but hidden variables to WifiConfiguration: isIBSS and
frequency. These are used for configuring IBSS mode.

WifiConfigStore is exended to get and set these variables to wpa_supplicant
(via WifiNative).

Change-Id: Iab02c3d738c05c2de036350ea77b78789213e357
Wifi: Add IBSS supported method

Add method isIbssSupported() to WifiManager and related classes to query wether
the driver supports IBSS mode. The query is answered by wpa_supplicants new
command "get_capability modes".

It will only return a correct result after WIFI_STATE_ENABLED has been
reached.

Change-Id: I93aa2fdff94cd897c91ec3beb7e58940d1de7b72
am: Allow more hidden apps on devices with lots of RAM

 * If more than 1.5GB is present, allow up to 40 hidden apps.
 * Number is somewhat arbitrary, but was found to work well on D2.
 * Also look at the sys.mem.max_hidden_apps value if given.

Change-Id: I2d3cf6e0dad1bc0b482cc37bf9c61ed2f2b4be51
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Merge branch 'sgt7' into CM10.1