* Refactor netkeystore.c to make client and server code testable.
* Add a client test for setting new passwd and changing passwd.
* Exclude "." and ".." from reset_keystore().
* Change ServerCommand.executeCommand() to accept variable length of
arguments and add convert() to marshalling the args to bytes.
* Keystore.java is revised accordingly.
Merge commit 'f84a21820b39dbfa983352b7d8ac949e560827d3' into eclair-plus-aosp
* commit 'f84a21820b39dbfa983352b7d8ac949e560827d3':
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp
* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
make sure conditions will return when the status of a surface is not NO_ERROR
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp
* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp
* commit '38a1081cad9385073d80d358decf04f6b2fd5723':
Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Merge commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23' into eclair-plus-aosp
* commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23':
AGL's glCompressedTexImage2D now checks the imageSize parameter.
Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp
* commit '68f591b17537cb437ca0b25d00a6d3d08e507abb':
Try not to crash the system server because of corrupt restore data
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp
* commit '181b31a0d87d525ea64102a965210331e0c6885b':
Process: Add support for using scheduler policies instead of cgroups.
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp
* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp
* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
Allow an alternate eri file.
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp
* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
Fix issue #1943927: need notification in status bar when adb is active
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp
* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
Dialog titles would sometimes use a font too large.
Merge commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d' into eclair-plus-aosp
* commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d':
default dithering to ON (cheap, looks good)
Merge commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f' into eclair-plus-aosp
* commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f':
[Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Merge commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac' into eclair-plus-aosp
* commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac':
Fix for bug # 2023074: settings db updater broken at version 34.
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp
* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
Add component name to informational logging in OMXCodec.cpp
Merge commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd' into eclair-plus-aosp
* commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd':
Add timestamp support for call history vcard
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp
* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp
* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
Support for amr-wb tracks in MPEG4Extractor.
