Merge commit '4c95917590d1a992b7fe8f6e703353fdf5a0bf3c' into eclair-mr2-plus-aosp
* commit '4c95917590d1a992b7fe8f6e703353fdf5a0bf3c':
add one script to make release keys
This script can replace the copies of mkkey.sh sprinkled all over the
tree. It prompts nicely for passwords, avoids writing the raw private
key to disk, and always generates certs that use sha1WithRSAEncryption.
Merge commit 'bd2ced1184a498fe5e6d93e780707e99971a0216'
* commit 'bd2ced1184a498fe5e6d93e780707e99971a0216':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Merge commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916'
* commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916':
Refactoring the logging interface to remove dependence on NPP.
Merge commit '51cce58c45591fdf3d0cd59a92aeb18182eaeded' into eclair-mr2-plus-aosp
* commit '51cce58c45591fdf3d0cd59a92aeb18182eaeded':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Merge commit 'e62ce17ac9726d6c169d5378db6027b2d8a16fcc' into eclair-mr2-plus-aosp
* commit 'e62ce17ac9726d6c169d5378db6027b2d8a16fcc':
Refactoring the logging interface to remove dependence on NPP.
Merge commit 'f7c5f462dd904a00d7d0bfb7e4cb300798592cdf'
* commit 'f7c5f462dd904a00d7d0bfb7e4cb300798592cdf':
Correct the raw offsets in the time zone index for a few zones.
Merge commit '78cab8038a79f1e42e42b17b0ff180e676653e31' into eclair-mr2-plus-aosp
* commit '78cab8038a79f1e42e42b17b0ff180e676653e31':
Correct the raw offsets in the time zone index for a few zones.
Merge commit '0d6684c86f152dabf7476d269fdaa3de1eb8fcac' into eclair-mr2
* commit '0d6684c86f152dabf7476d269fdaa3de1eb8fcac':
Correct the raw offsets in the time zone index for a few zones.
ZoneCompactor was using the system time zone database to get the offsets
instead of using the data it was compiling, so for newly added or recently
changed zones the index could be inconsistent with the data.
Affected zones: San_Luis, Casey, Davis, Mawson, Kathmandu, Novokuznetsk
Ensures that no stale/obsolete shared libraries are left in the
application's project path before the build.
Also fix a minor typo that made the ABI selection process not
work properly in certain cases.
Merge commit '14f81209b79faf87bf4ffed6fbaaa9da6a75d770' into eclair-mr2-plus-aosp
* commit '14f81209b79faf87bf4ffed6fbaaa9da6a75d770':
Remove placeholder "-" label text, that was breaking the build.
Merge commit '0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-mr2
* commit '0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Previous change 33290 was screwed up.
Xav, please pardon a repo newbie!
Merge commit '75239b51770825ea3da2673d4b81be1676145d51'
* commit '75239b51770825ea3da2673d4b81be1676145d51':
docs: make the apidemos app index page only display the
Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp
* commit '21acc90055935d052e350fe441091091c2421010':
docs: make the apidemos app index page only display the
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Merge commit '1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair
* commit '1558abd6d3706380cf4634c151ee7952e0b317fb':
docs: make the apidemos app index page only display the
* changes:
docs: make the apidemos app index page only display the shortcut links when the docs are online, because these links will not resolve when the docs are offline.
Merge commit '2e00a8137d02b7478687f08431cd1f62abf17344' into eclair-mr2-plus-aosp
* commit '2e00a8137d02b7478687f08431cd1f62abf17344':
Add support for armeabi-v7a to the NDK.
Merge commit 'c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2
* commit 'c7f23b570c16d99ce30b9819e28caee480795030':
Add support for armeabi-v7a to the NDK.
