Merge commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2'
* commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2':
New download manager error code when we can't resume.
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp
* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
New download manager error code when we can't resume.
Merge commit '5085848ddbadaafa088ed85753156adc2e54554d'
* commit '5085848ddbadaafa088ed85753156adc2e54554d':
Make the LED colors when charging customizable by the vendor
Merge commit '209e651805dd40ea87df7ff67f2755605be9308c' into gingerbread-plus-aosp
* commit '209e651805dd40ea87df7ff67f2755605be9308c':
Make the LED colors when charging customizable by the vendor
Merge commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433' into gingerbread-plus-aosp
* commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433':
Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
Merge commit '264348361e0660948a09fe516a535b7c60998def'
* commit '264348361e0660948a09fe516a535b7c60998def':
GPS: Initialize XTRA support when GPS is enabled
Merge commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815' into gingerbread-plus-aosp
* commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815':
GPS: Initialize XTRA support when GPS is enabled
Results in an approximately 60% reduction in InputDispatcher thread CPU time.
(Went from 3% to 1% when measured with CPU frequency scaling disabled.)
Change-Id: Ia6e6087a719ee518fe37b428a871c7240bd4143f
The MenuInflater returned by ActionModes will set the default
showAsAction value to "ifRoom" if not otherwise specified.
Change-Id: I86045dc4e877a97a3464a1a5f44d8d1e2120b086
* Fix a bug where the options panel would not open on non-xlarge
screens to show overflow menu items.
* Fix a bug where ActionBarView would try to add a custom nav view
twice.
* Fix a bug where ActionBarView would expand too far in wrap_content mode
Change-Id: I433ea56524aad885d813ae8743fe2fcefa9649fa
Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'
* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
Change the default time scale for audio/video track during recording
Merge commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2'
* commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2':
add an api for getting a device serial number
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'
* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
Fix problems with determining when to kill apps for wake usage.
Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'
* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
Use audio clock as the reference media clock
Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41'
* commit 'b2c315ebe79359fa443533f9ab55e9b730938e41':
fix a typo that prevented glTexImage2D codepath to work
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.
Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
Merge commit '80810f86e93866674f3a4ca61f84887e7717aa63' into gingerbread-plus-aosp
* commit '80810f86e93866674f3a4ca61f84887e7717aa63':
Fix crash in status bar ticker.
