Merge commit '12482deafbe520ed9e88691e0caaa6f5e0e49519'
* commit '12482deafbe520ed9e88691e0caaa6f5e0e49519':
Updated status bar graphics (drop date 9/25/09).
Merge commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'
* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0'
* commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0':
Add documentation about flash and change video-light to torch.
Merge commit 'b19774d520bde5bb12d80417788d9a773e123c14' into eclair-plus-aosp
* commit 'b19774d520bde5bb12d80417788d9a773e123c14':
Updated status bar graphics (drop date 9/25/09).
Merge commit '98b050d067037bd25ac81b75d46bf030c6d73b9e'
* commit '98b050d067037bd25ac81b75d46bf030c6d73b9e':
add new column "real_date" for IM messages table.
Merge commit '7df612ceb9edd01808cd74bd460a55b548df8010'
* commit '7df612ceb9edd01808cd74bd460a55b548df8010':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5'
* commit '528961a61d99280e67fbb13b78b3d2538c3025d5':
Handle expiration of discovery mode in system server.
Merge commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055'
* commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055':
When change from narrow screen to wide screen, we will
Merge commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c'
* commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c':
Add official assets for tabs in compatibility mode
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'
* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
Add auto-brightness mode to the list of backed-up settings
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e'
* commit '5cf07feb3df89e827324e1204674c4f3629eb27e':
Fix 2146581: Make tabs work for donut apps
Merge commit 'c321ab992d526cde098986d512ce4a051c486607'
* commit 'c321ab992d526cde098986d512ce4a051c486607':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
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 '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9'
* commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9':
Allow us to set the contact uri without setting the fast track's uri
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'
* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
add a optional String to the key of notifications to allow users
Merge commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8'
* commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8':
If WebCore doesn't response touch down in time, don't
