Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-plus-aosp
* commit '572e0087a86c6781e3334f8a6f901039a407138d':
Return null if SIM doesn't have the MSISDN Aplha tag.
Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-plus-aosp
* commit '274072089ceff6eacb9ccfb59290a18f43739c87':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-plus-aosp
* 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 '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp
* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
Add code to use Gservices provided values for throtting NITZ updates.
in the kernel requires a guard page, so 1M allocations fragment memory very
badly. Subtracting a couple of pages so that they fit in a power of
two allows the kernel to make more efficient use of its virtual address space.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-plus-aosp
* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
Revert change incorrectly submitted as part of change #32153.
Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-plus-aosp
* commit 'dffa96f7349a44a5d587656fce5c55386d44b150':
fix [2143798] Need to figure out how to do video on Passion w/ GPU
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-plus-aosp
* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
Update keyguard and pattern-lock layouts for new UX designs.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-plus-aosp
* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'c66d53f97b1fe635f576642d5720dcd441e34cce' into eclair-plus-aosp
* commit 'c66d53f97b1fe635f576642d5720dcd441e34cce':
Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-plus-aosp
* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
Don't back up system wallpapers.
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
Merge commit '2ba297d19e101ab3c6456aa7813a043d66c572b6' into eclair-plus-aosp
* commit '2ba297d19e101ab3c6456aa7813a043d66c572b6':
Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-plus-aosp
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-plus-aosp
* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
* changes:
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states. Tweak "animation" to be 250ms based on conversation with ui guys. Some minor performance tweaks to SlidingTab.
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-plus-aosp
* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-plus-aosp
* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
New Javadoc for ContactsContract.
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-plus-aosp
* commit '2ade6421f2d6dd615b559c951deace7143958b90':
Debugging for issue #2250075: Desk dock clock app sometimes doesn't
