OSDN Git Service

Merge branch 'logging_888752' into logging_dalvik
authorJesse Wilson <jessewilson@google.com>
Thu, 10 Dec 2009 00:29:30 +0000 (16:29 -0800)
committerJesse Wilson <jessewilson@google.com>
Mon, 14 Dec 2009 20:52:27 +0000 (12:52 -0800)
commitb2721408f3f6a83ffb16f8c3321235bb4415c20e
tree868f7564d07f06186e2fd2fb1112e67bba1b3abd
parentc047c11da7d284940bcac9a28c42145628d49fed
Merge branch 'logging_888752' into logging_dalvik

Conflicts:
     libcore/logging/META-INF/MANIFEST.MF
     libcore/logging/src/main/java/java/util/logging/LogManager.java
     libcore/logging/src/main/java/java/util/logging/Logger.java
     libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
libcore/logging/src/main/java/java/util/logging/LogRecord.java
libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java