diff options
| author | Jesse Wilson <jessewilson@google.com> | 2009-05-11 19:08:46 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2009-05-11 19:08:46 -0700 |
| commit | 9a0fbe99031759393563ee69ac4640f66f182686 (patch) | |
| tree | 99865da7d37c745ce9f293a29322ae1c67def4e0 /annotation/src | |
| parent | 4031b57a9518fc2ad73ec001aa5d968e446fa978 (diff) | |
| download | libcore-9a0fbe99031759393563ee69ac4640f66f182686.zip libcore-9a0fbe99031759393563ee69ac4640f66f182686.tar.gz libcore-9a0fbe99031759393563ee69ac4640f66f182686.tar.bz2 | |
Bringing the logging module up to Harmony r772995.
commit 080ff677c719f1e53ffb544c3fb684bb9ff28677
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon May 11 19:06:05 2009 -0700
Copied test changes over manually.
commit ea52f28de5378f7dd4eff5c0f83d805e997a98de
Merge: 0c1f753 a6c8255
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon May 11 18:49:28 2009 -0700
Merge branch 'logging_772995' into logging_dalvik
Conflicts:
libcore/logging/.classpath
libcore/logging/META-INF/MANIFEST.MF
libcore/logging/build.xml
libcore/logging/src/main/java/java/util/logging/ConsoleHandler.java
libcore/logging/src/main/java/java/util/logging/FileHandler.java
libcore/logging/src/main/java/java/util/logging/Formatter.java
libcore/logging/src/main/java/java/util/logging/Handler.java
libcore/logging/src/main/java/java/util/logging/Level.java
libcore/logging/src/main/java/java/util/logging/LogManager.java
libcore/logging/src/main/java/java/util/logging/LogRecord.java
libcore/logging/src/main/java/java/util/logging/Logger.java
libcore/logging/src/main/java/java/util/logging/LoggingMXBean.java
libcore/logging/src/main/java/java/util/logging/LoggingPermission.java
libcore/logging/src/main/java/java/util/logging/MemoryHandler.java
libcore/logging/src/main/java/java/util/logging/SimpleFormatter.java
libcore/logging/src/main/java/java/util/logging/SocketHandler.java
libcore/logging/src/main/java/java/util/logging/StreamHandler.java
libcore/logging/src/main/java/java/util/logging/XMLFormatter.java
libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
commit 0c1f7538e6fe3091a3d142b2ac14f5bf338b3a55
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon May 11 16:06:59 2009 -0700
Stripped @since Android 1.0
commit 4c715c6c58080b3cbed2928cd1b71b9931e217a3
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon May 11 15:57:59 2009 -0700
Logging Dalvik.
commit a6c8255dbbad85145a2066d9846d24787df0f75f
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon May 11 15:56:41 2009 -0700
Logging 772995
commit db77dbdf56e99e3dcced2d758f7150007562c41c
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon May 11 15:54:13 2009 -0700
Logging 527399
Diffstat (limited to 'annotation/src')
0 files changed, 0 insertions, 0 deletions