summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-08-02 01:21:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-02 01:21:35 +0000
commit0981f2eee828f7c2903e2aeb975c2eddcd75df4d (patch)
tree59566031877a5936ad2d6377813d15b418fc6539 /core/java/android
parent3d3bd67f8186aecd5ff9cc3d6a9ccd4e41e65c9a (diff)
parent3bbdabce1f34a6725f08ab27afdca3171f76bfe1 (diff)
Merge "Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72 am: 37030d9884 am: 2b55fef6b9"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/util/Log.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/util/Log.java b/core/java/android/util/Log.java
index 2499afb7e8f3..1b063e16ed59 100644
--- a/core/java/android/util/Log.java
+++ b/core/java/android/util/Log.java
@@ -380,8 +380,8 @@ public final class Log {
/** @hide */ public static final int LOG_ID_SYSTEM = 3;
/** @hide */ public static final int LOG_ID_CRASH = 4;
- /** @hide */ public static native int println_native(int bufID,
- int priority, String tag, String msg);
+ /** @hide */
+ public static native int println_native(int bufID, int priority, String tag, String msg);
/**
* Return the maximum payload the log daemon accepts without truncation.