Merge commit '549db46cb31725a66cd32ad4e0abb0d60d893fca'
* commit '549db46cb31725a66cd32ad4e0abb0d60d893fca':
Fix aapt to be able to add configs from overlays.
Merge commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836'
* commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836':
make sure to update a surface's usage bits when it changes, instead of only the first time.
Merge commit '82726f045de91b899502a54ca76d234c43a1ba4b'
* commit '82726f045de91b899502a54ca76d234c43a1ba4b':
ConnectivityService: Do not send broadcasts until the system is ready.
Merge commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8'
* commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8':
Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.
Merge commit 'a8dfe24da014b52d7ae93c3fbd7a8b88ec336572'
* commit 'a8dfe24da014b52d7ae93c3fbd7a8b88ec336572':
Adds the ability to configure the mock Geolocation service from DumpRenderTree.
Merge commit '68e530047786b4f9d219d17652d7429e6e5a21bd'
* commit '68e530047786b4f9d219d17652d7429e6e5a21bd':
The local loaders assume the url given to them is decoded.
Merge commit 'a31deaf4a960058e533da35d6229f7aa8d4f00c1'
* commit 'a31deaf4a960058e533da35d6229f7aa8d4f00c1':
fix a bug that could cause a window to be hidden in some cases.
Merge commit '185a5133cf4c805d3996a7f8fc3912a072f60f18'
* commit '185a5133cf4c805d3996a7f8fc3912a072f60f18':
Change the number of volume steps from 6 to 7 per Verizon Requirements
this would happen is the window is made visible but the client didn't render yet into it. This happens often with SurfaceView.
Instead of filling the window with solid black, SF would simply ignore it which could lead to more disturbing artifacts.
in theory the window manager should not display a window before it has been drawn into, but it does happen occasionnaly.
Merge commit '1d47a5142682c1f9f9a04fdbe1ec863fd5550c30'
* commit '1d47a5142682c1f9f9a04fdbe1ec863fd5550c30':
Fix handling of reference XML file in layout files
Merge commit '314e0226a26cd79b5080dcb76d566fa6f83ff695'
* commit '314e0226a26cd79b5080dcb76d566fa6f83ff695':
Mock ServiceManager and AccesibilityManager to make the view renders in ADT
Merge commit '317a6280cc109e873646e4652be1582d870eedfd'
* commit '317a6280cc109e873646e4652be1582d870eedfd':
Surface::GPU and Surface::HARDWARE are now deprecated; they will be set automatically if needed.
Merge commit '8db93389141fbce1e37f4c22f415fc2cebf19ebf'
* commit '8db93389141fbce1e37f4c22f415fc2cebf19ebf':
ui: make native_window_set_usage be a static inline
Merge commit '94ff3f1f08805b68c5524b39024968aebcdc83ee' into eclair
* commit '94ff3f1f08805b68c5524b39024968aebcdc83ee':
Fix handling of reference XML file in layout files
Merge commit 'e1b63d224a0a68191f087186c470cde317e3fa76' into eclair
* commit 'e1b63d224a0a68191f087186c470cde317e3fa76':
Mock ServiceManager and AccesibilityManager to make the view renders in ADT
