* Microsoft Office common extensions
* .xml -> text/xml
* Change existing mapping of ".pot"->"text/plain" to ".po"
Note: We already had a definition for .pot to text/plain. Per the
information found at <http://www.fileinfo.com/extension/pot> this is the
rarely seen "portable object file", and is often named ".po" to avoid
this same conflict.
Addresses bug # 2097457
Change-Id: I964b853fdeae77d742f627c535a8b32e0e53516a
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp
* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp
* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
Add documentation about flash and change video-light to torch.
Merge commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0' into eclair-plus-aosp
* commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0':
Don't back up / restore "allow apps from unknown sources"
We no longer back up the state of the "Allow the installation of applications
from unknown sources" setting, nor do we set that based on restore data even if
it is present.
Change-Id: Ida276874616f1ff82807d642b0b733fcab339529
Merge commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb' into eclair-plus-aosp
* commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb':
add new column "real_date" for IM messages table.
Check the delta for short press case as we may switch to
PREVENT_DRAG_NO at SWITCH_TO_SHORTPRESS.
This should fix another two corner cases where flick doesn't
do anything.
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp
* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp
* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
Handle expiration of discovery mode in system server.
Merge commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2' into eclair-plus-aosp
* commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2':
When change from narrow screen to wide screen, we will
Merge commit '141e4f1d69186104c3e169ee7365b62bc425859a' into eclair-plus-aosp
* commit '141e4f1d69186104c3e169ee7365b62bc425859a':
Add auto-brightness mode to the list of backed-up settings
Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp
* commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31':
Changing contact status to Presence-based
Merge commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735' into eclair-plus-aosp
* commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735':
Fix 2146581: Make tabs work for donut apps
Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp
* commit '093f581090d8cf98f5877746d924107f7695dd8b':
The touch screen is probably a feature.
Merge commit '3579c4c6729dd8aa077550531a8337bf0664b23d' into eclair-plus-aosp
* commit '3579c4c6729dd8aa077550531a8337bf0664b23d':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp
* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
Remove query parameters for delaying group updates.
It was clearing the interfacename when it was needed later in the process - the prevented us
from clearing the route to private dns servers and clearing the flag that this was set.
Consequently future uses would not set the private dns servers (since it thought they were already
set) and our lookups would fail.
bug: 2146929
