Merge commit 'e627a75974f7d786d7f5f28909e535c09f6cc8b1'
* commit 'e627a75974f7d786d7f5f28909e535c09f6cc8b1':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '50b690625b4dd37475d6966f9037801b2ddde5f8' into eclair-mr2-plus-aosp
* commit '50b690625b4dd37475d6966f9037801b2ddde5f8':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2
* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-plus-aosp
* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '23eb822369952931935589a8b838929b4c044fba'
* commit '23eb822369952931935589a8b838929b4c044fba':
Refactor vCard test code and modify unit tests.
Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp
* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
Refactor vCard test code and modify unit tests.
Factor out all the classes previously embedded in VCardTestsBase.java so that readers are able to
look over each file easily and each class explicitly mention the dependency between each other.
Make all the test cases use mVerifier in VCardTestsBase so that verify() call will not be
forgotten. Actually there were three tests found in which verify() was not called.
Internal issue number: 2195990
Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'
* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp
* commit 'eb114de5037bba89333bd7d57d305ae989727096':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'
* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp
* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'
* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp
* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp
* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'
* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
Clean up codes and remove/modify stale codes/comments.
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'
* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'
* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
Rename several files so that readers would not be confused.
Merge commit '8c808187249f473702e0f4bee2147da292490963' into eclair-mr2-plus-aosp
* commit '8c808187249f473702e0f4bee2147da292490963':
Modify test code a little.
Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp
* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
Clean up codes and remove/modify stale codes/comments.
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp
* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.
Make Constants public and rename it to VCardConstants.
Internal issue number: 2242528, 2195990
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp
* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
Rename several files so that readers would not be confused.
The parse3339 JNI code doesn't properly do bounds checking on the input String.
These changes do some bounds checking to prevent a buffer underflow condition.
parse3339 should allow the fractional seconds to be optional and an arbitrary
length as specified in RFC 3339. This will scan through arbitrary precision
until it finds the timezone indicators.
Change-Id: Ie9d01d0b24163d893c58c747d37873c83b74e6c7
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'
* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
Add unit tests for Japanization and fix several bugs.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp
* commit '592988d307e8d305ca163c4e58da0fb350054194':
Add unit tests for Japanization and fix several bugs.
Merge commit '640b44a070951696bbeb39e0ddac1c7aa861e35d'
* commit '640b44a070951696bbeb39e0ddac1c7aa861e35d':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8' into eclair-mr2-plus-aosp
* commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
