summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Simplify EventLog interface -- remove supported for nestedDan Egnor2010-01-062-29/+11
| | | | | | | | | | | | sequences (which nobody used) and streamline the API, adding documentation in preparation for inclusion in the SDK. Gut and deprecate EventLogTags, which unfortunately was put into the public SDK (an oversight). Include the functionality in EventLog proper, in a simpler and easier to use manner. This change doesn't actually un-@hide anything, but it does change it to @pending.
* Do not use a user tag on apps, as it is ignored.Jean-Baptiste Queru2010-01-062-2/+2
| | | | | | | | | | The build system does not honor user tags on apps, and setting it is misleading. This removes the confusion by making the makefiles behave like they read. Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
* Fix test breakage in vCard exporter.Daisuke Miyakawa2010-01-052-3/+63
| | | | | | | | | | | | | Due to the change Iae8dbac1, all tests for vCard exporeter has failed. This change fixes the breakage by using a kind of dirty Dependency Injection. Current test framework for vCard exporter strongly depends on the assumption that ContentValues objects are able to be directly passed to objects which use ContentResolver, while the change above disabled the feature by removing queryEntities(). This change makes VCardComposer forcibly uses queryEntities() via Reflection. I agree that this change is not so clean, but works fine for now.
* Remove Google-specific (or only-used-by-Google-code) classes.Dan Egnor2010-01-045-1002/+0
| | | | Fix a small typo in Context javadoc.
* am 8d562f78: am bc7afcb9: Merge "free the NPObject in NPP_Destroy." into ↵Grace Kloba2010-01-041-1/+4
|\ | | | | | | | | | | | | | | | | eclair-mr2 Merge commit '8d562f78b4919babe1f7e32e974e5057dcfbb310' * commit '8d562f78b4919babe1f7e32e974e5057dcfbb310': free the NPObject in NPP_Destroy.
| * am bc7afcb9: Merge "free the NPObject in NPP_Destroy." into eclair-mr2Grace Kloba2010-01-041-1/+4
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5' into eclair-mr2-plus-aosp * commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5': free the NPObject in NPP_Destroy.
| | * free the NPObject in NPP_Destroy.Grace Kloba2009-12-271-1/+4
| | |
* | | resolved conflicts for merge of ad2fa35d to masterTom Taylor2009-12-223-3/+3
|\ \ \ | |/ / | | | | | | Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
| * | am d4a4729c: Update imports to android-commonTom Taylor2009-12-213-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp * commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0': Update imports to android-common
| | * Update imports to android-commonTom Taylor2009-12-213-3/+3
| | | | | | | | | | | | | | | Several files were moved to android-common. Update all the references to import those files from the new location.
* | | Merge change I34a427a5Android (Google) Code Review2009-12-211-5/+56
|\ \ \ | | | | | | | | | | | | | | | | * changes: Adding support for LoggingPrintStream.write(byte[]) and friends.
| * | | Adding support for LoggingPrintStream.write(byte[]) and friends.Jesse Wilson2009-12-181-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, Android's System.out and System.err are implemented by the AndroidPrintStream subclass of LoggingPrintStream. Until now, that class has silently discarded the raw bytes it has received. This causes two problems: Applications may be accidentally wasting CPU+memory writing to System.out. By making this output visible, the developers of such applications can silence the problem at the source. Application developers may be purposefully writing to these streams and perplexed by the data's disappearance. For example, the core library's own java.util.logging.ConsoleHandler sends its log data into this black hole. By making the data visible, we save the data and remove an unnecessary sharp edge from our API.
* | | | am c4978805: merge from open-source masterJean-Baptiste Queru2009-12-211-0/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c4978805dc8837570701629a9b8098e80804ad34' * commit 'c4978805dc8837570701629a9b8098e80804ad34': ImageButton example doesn't work. Default state should be at the last. Time.parse3339 range checking and proper 'sec-frac' skip
| * \ \ \ merge from open-source masterJean-Baptiste Queru2009-12-211-0/+81
| |\ \ \ \
| | * | | | Time.parse3339 range checking and proper 'sec-frac' skipKenny Root2009-11-161-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 from eclairJean-Baptiste Queru2009-11-15116-1985/+9027
| | |\ \ \ \
| | | * | | | eclair snapshotJean-Baptiste Queru2009-11-13116-1985/+9027
| | | | | | |
| * | | | | | am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the ↵Joe Onorato2009-12-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | monkeys builds. Merge commit '0d8055e51ce2666875e14c53e14765f673172b1c' into eclair-plus-aosp * commit '0d8055e51ce2666875e14c53e14765f673172b1c': Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
| * \ \ \ \ \ \ am 7dfecb86: Merge change Iaa6e73a6 into eclairOmari Stephens2009-12-022-4/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-plus-aosp * commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54': Revive backup tests
| * \ \ \ \ \ \ \ am bcab01f6: Merge change Ic9f6bf94 into eclairJoe Onorato2009-11-255-0/+243
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-plus-aosp * commit 'bcab01f6d0158c4d928f42b034949dc9608665a6': Add a test app that will drain the battery. NOT IN BUILD.
| * \ \ \ \ \ \ \ \ am d782b4b6: Add keyguard permission to instrumented ImfTest package.Brett Chabot2009-11-251-0/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp * commit 'd782b4b6f3411ece7299f414783baa3758756bbe': Add keyguard permission to instrumented ImfTest package.
| * \ \ \ \ \ \ \ \ \ am 7f7c16de: Merge changes I0c77eca9,Ibd184157,I81947f67 into eclairBen Murdoch2009-11-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-plus-aosp * commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47': Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge. Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge. Improves documentation for GeolocationPermissions class. Do not merge.
| * \ \ \ \ \ \ \ \ \ \ am 7f8e3409: Merge change I816428ae into eclairSwarna Kumar2009-11-242-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-plus-aosp * commit '7f8e34091efdee1a383280b08585f8254472c1fd': Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
| * \ \ \ \ \ \ \ \ \ \ \ am 57bda83d: Merge change I4f614c9e into eclairJoe Onorato2009-11-1940-0/+743
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-plus-aosp * commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870': Add a test app that has 100 icons. None of them do anything when clicked.
| * \ \ \ \ \ \ \ \ \ \ \ \ am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some ↵Guang Zhu2009-11-122-18/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout test failures. Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-plus-aosp * commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c': Use a diff that ignores trailing whitespaces to get by some layout test failures.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am b90a187d: Merge change Ie994c0e8 into eclairjsh2009-11-061-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-plus-aosp * commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595': Update CdmaSmsTest unit test.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c3f3f9a9: Merge change Ie71d9e42 into eclairJoe Onorato2009-11-052-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-plus-aosp * commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c': Another test for StatusBar test.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bfa68abc: layout test rebase, bug fixGuang Zhu2009-11-055-33/+721
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-plus-aosp * commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7': layout test rebase, bug fix
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c20fc77c: Merge change Iefd4a388 into eclairBrett Chabot2009-11-041-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-plus-aosp * commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365': Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e8228afb: Merge change I92cdc5ed into eclairJack Wang2009-10-301-70/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-plus-aosp * commit 'e8228afb2bd005ae25ce58719f9d678389b26a16': PerformanceCollector: Collect & report perf measurements in key/value form
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aebcaec3: Merge change I2e90d640 into eclairGuang Zhu2009-10-271-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-plus-aosp * commit 'aebcaec3c171f636a24051ce85ded2f86b09461b': Remove the activity restart between urls.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b81df8e3: Merge change I5535bbdf into eclairBrett Chabot2009-10-2611-19/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-plus-aosp * commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56': Disable flaky and failing tests.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6270d52c: Merge change Ica1d7b90 into eclairBrett Chabot2009-10-202-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-plus-aosp * commit '6270d52c0dded8658733a392f3ef1f521bc5dbee': Disable known failure math tanhd tests (DO NOT MERGE)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 76bb9a36: Merge change I1932e8f8 into eclairBrett Chabot2009-10-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-plus-aosp * commit '76bb9a363633b5741937ebe58b01a8b2024753b0': Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e58e642: Enable some tests that requires local http serverGuang Zhu2009-10-151-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-plus-aosp * commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd': Enable some tests that requires local http server
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 773fd131: Merge change I3429f77a into eclairBrett Chabot2009-10-071-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '773fd13130948397cac5178e16d17975a06a738b' into eclair-plus-aosp * commit '773fd13130948397cac5178e16d17975a06a738b': Suppress flaky test HeapTest#testOomeLarge.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c404ed2b: Fix failing unit test; the test was using a deprecated API ↵Romain Guy2009-10-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | making it fail on WVGA devices. Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-plus-aosp * commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b': Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c8dba21: Merge change I61aac7b3 into eclairTammo Spalink2009-10-071-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102' into eclair-plus-aosp * commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102': Add PERIOD char to CDMA address sugar list.
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge change I3632fedeAndroid (Google) Code Review2009-12-181-132/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Bug 2330278
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2330278Paul Westbrook2009-12-171-132/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted old copy of SimplePullParser, since it has been moved to gdata
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated test GridTouchVerticalSpacingStackFromBottomTest for larger screens.Adam Powell2009-12-161-2/+6
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses bug 2176089 http://b/issue?id=2176089 Now takes into account screen scaling.
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 5a374f94 to masterFred Quintana2009-12-151-587/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 274dc9d3: moved the hidden sync helpers out of the frameworkFred Quintana2009-12-151-587/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp * commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f': moved the hidden sync helpers out of the framework
| | * | | | | | | | | | | | | | | | | | | | | | | | | moved the hidden sync helpers out of the frameworkFred Quintana2009-12-141-587/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2326468Paul Westbrook2009-12-152-386/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted old copy of the GoogleHttpClient, and the unit tests.
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 15d3bb2c to masterPaul Westbrook2009-12-143-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 7762d936: Unbundling workPaul Westbrook2009-12-143-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7762d93621f508f4410fd37b5bbdfec0071b0420' into eclair-mr2-plus-aosp * commit '7762d93621f508f4410fd37b5bbdfec0071b0420': Unbundling work
| | * | | | | | | | | | | | | | | | | | | | | | | | | Unbundling workPaul Westbrook2009-12-143-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved AndroidHttpClient, Rfc822InputFilter, Rfc822Validator NumberPicker, NumberPickerButton to android-common ---
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of f6bb01b0 to masterDan Egnor2009-12-112-75/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am b7f0367c: Eliminate CrashData and friends.Dan Egnor2009-12-112-75/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b7f0367cec1c744aa66ef397b0244e25d507491c' into eclair-mr2-plus-aosp * commit 'b7f0367cec1c744aa66ef397b0244e25d507491c': Eliminate CrashData and friends.