summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2018-08-01 17:28:24 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-01 17:28:24 -0700
commit2b55fef6b92bfaf8887f273c3d53928bc5035fc3 (patch)
tree25f9afc827a6563581f9a75e3d35cfcb5ff9c0cf /core/java/android
parente377a769bd12321b4d94a05fc1ffb6cb03cb42d9 (diff)
parent37030d988443961becc521fcdec0a44cdb61e2e2 (diff)
Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72
am: 37030d9884 Change-Id: I3526cd00cffc1e4857cfda9bab32b0f1a130d55c
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 029986534890..7305f85469d8 100644
--- a/core/java/android/util/Log.java
+++ b/core/java/android/util/Log.java
@@ -370,8 +370,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.