Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp
* commit '26cab06472badee374ac854f5a210991c37c4493':
Allow two finger pan and scale on touchscreens with
Moves the remoteNativeLibrariesLI call to NativeLibraryHelper to prepare
for being able to symlink the /data/data/<package>/lib dir to the ASEC
container.
Change-Id: Ie3648509c6b6293a8d9bdd815610ab408df5047f
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp
* commit '89e05fd560e3347070a55260b7aaec3db5647442':
Fix the layouting of the checkbox.
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp
* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
Fix number counter will keep going after window losed focus.
Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855'
* commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855':
Make sure OutOfMemoryError is handled by WallpaperManager
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp
* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
Make sure OutOfMemoryError is handled by WallpaperManager
Merge commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0'
* commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
Changed menu and expandedMenu background color to dark.
Make the documentation match the current behavior since change ID
Ibdeff170bd386d723f774136b18e0ad59d9cdabb.
Change-Id: I9d24800ba98f14cb278f029cdf37a086394d1747
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp
* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
Changed menu and expandedMenu background color to dark.
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
Merge commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473' into gingerbread-plus-aosp
* commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473':
Import revised translations. DO NOT MERGE
Merge commit '4940ff85d561310d2c122ca6bd7de4d00772b095' into gingerbread-plus-aosp
* commit '4940ff85d561310d2c122ca6bd7de4d00772b095':
Update to new ddmlib-prebuilt api.
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp
* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
Fix the last remaining @deprecated tag without comment warning.
