Merge commit 'da5e90bee443129511e231e9078a134626b87541'
* commit 'da5e90bee443129511e231e9078a134626b87541':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit 'adf38939836ee1d1f5967fc45d02e07117f44009'
* commit 'adf38939836ee1d1f5967fc45d02e07117f44009':
Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state.
Merge commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8' into eclair-mr2-plus-aosp
* commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8':
Return null if SIM doesn't have the MSISDN Aplha tag.
Merge commit '66b5d902a29e08237f16be53a84f9c2472df8493' into eclair-mr2-plus-aosp
* commit '66b5d902a29e08237f16be53a84f9c2472df8493':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit 'da8bb292db289bdd0e02b672daec09e2a3f9f462' into eclair-mr2-plus-aosp
* commit 'da8bb292db289bdd0e02b672daec09e2a3f9f462':
Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state.
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'
* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
Add unit tests for Japanization and fix several bugs.
Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp
* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
Add code to use Gservices provided values for throtting NITZ updates.
Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2
* commit '572e0087a86c6781e3334f8a6f901039a407138d':
Return null if SIM doesn't have the MSISDN Aplha tag.
Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-mr2
* commit '274072089ceff6eacb9ccfb59290a18f43739c87':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-mr2
* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp
* commit '592988d307e8d305ca163c4e58da0fb350054194':
Add unit tests for Japanization and fix several bugs.
Merge commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9'
* commit '440110fbfe00fa8f16087b33f0f3057e0ca057a9':
Revert change incorrectly submitted as part of change #32153.
Merge commit '2c694f032c1bea7003098336b32861e7b97aa9c7'
* commit '2c694f032c1bea7003098336b32861e7b97aa9c7':
fix [2143798] Need to figure out how to do video on Passion w/ GPU
Merge commit '897a744bb7a95b2d3883004301b8e877cd5efc92' into eclair-mr2-plus-aosp
* commit '897a744bb7a95b2d3883004301b8e877cd5efc92':
Revert change incorrectly submitted as part of change #32153.
Merge commit 'daafd5441af5a180edd20d6edf74a9bd8117a287' into eclair-mr2-plus-aosp
* commit 'daafd5441af5a180edd20d6edf74a9bd8117a287':
fix [2143798] Need to figure out how to do video on Passion w/ GPU
Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2
* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
Revert change incorrectly submitted as part of change #32153.
Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-mr2
* commit 'dffa96f7349a44a5d587656fce5c55386d44b150':
fix [2143798] Need to figure out how to do video on Passion w/ GPU
This fixes a bug where the right tab hightlight wasn't being seen.
The prooblem was that we weren't preserving the drawables' states when
the application requested a new drawable. We now track the drawable state
so we can updated it when the resources change.
Merge commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69'
* commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69':
Update keyguard and pattern-lock layouts for new UX designs.
Merge commit '640b44a070951696bbeb39e0ddac1c7aa861e35d'
* commit '640b44a070951696bbeb39e0ddac1c7aa861e35d':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'bfdb1e88ef796969efc906e7648b552078c82aee'
* commit 'bfdb1e88ef796969efc906e7648b552078c82aee':
Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
Merge commit 'd1a3fc38e99e0483402168529020e758ecd777ce' into eclair-mr2-plus-aosp
* commit 'd1a3fc38e99e0483402168529020e758ecd777ce':
Update keyguard and pattern-lock layouts for new UX designs.
