Merge commit '567716acc5761245e7073f258f74cad769d97f34'
* commit '567716acc5761245e7073f258f74cad769d97f34':
PackageManager: Support secondary ABI for native code at installation time.
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 '097855eb00971092ff6332aa2bf0fae71f42ab5f' into eclair-mr2-plus-aosp
* commit '097855eb00971092ff6332aa2bf0fae71f42ab5f':
PackageManager: Support secondary ABI for native code at installation time.
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 '6f5ba93469bc26f33b5a260a394406970536c260' into eclair-mr2
* commit '6f5ba93469bc26f33b5a260a394406970536c260':
PackageManager: Support secondary ABI for native code at installation time.
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.
The goal of this change is to allow the Package Manager to look for native
shared libraries corresponding to the CPU ABI reported by ro.product.cpu.abi2
if none was found for the CPU ABI given by ro.product.cpu.abi
This is used to support both ARMv5 and ARMv7 native code on modern ARMv7-based
devices. Typically, such a device would report a primary ABI of 'armeabi-v7a'
and a secondary one of 'armeabi', to indicate that it can run the binaries
generated for both.
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
