summaryrefslogtreecommitdiffstats
path: root/device/vibration
diff options
context:
space:
mode:
authoraurimas <aurimas@chromium.org>2015-07-30 12:51:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-30 19:51:46 +0000
commitca3b8039302e6be7470b233cc8b7c6c817985d14 (patch)
tree5d846ff3ec9c43b736483f7af8866db4173cab97 /device/vibration
parenta5597f6cabd7d88393f67a81df9bfe4965d574a3 (diff)
downloadchromium_src-ca3b8039302e6be7470b233cc8b7c6c817985d14.zip
chromium_src-ca3b8039302e6be7470b233cc8b7c6c817985d14.tar.gz
chromium_src-ca3b8039302e6be7470b233cc8b7c6c817985d14.tar.bz2
Move JNI annotations to annotations package.
The rest of the annotations already live in this package, so this CL moves CalledByNative, NativeCall, JNIAdditionalImport, NativeClassQualifiedName and JNINamespace to the same package. BUG=None TBR=armansito@chromium.org,asvitkine@chromium.org,atwilson@chromium.org,avayvod@chromium.org,bauerb@chromium.org,boliu@chromium.org,brettw@chromium.org,dtrainor@chromium.org,gunsch@chromium.org,lambroslambrou@chromium.org,mef@chromium.org,mnaganov@chromium.org,mnissler@chromium.org,peter@chromium.org,qinmin@chromium.org,sky@chromium.org,yfriedman@chromium.org,yukawa@chromium.org,zea@chromium.org Review URL: https://codereview.chromium.org/1263053002 Cr-Commit-Position: refs/heads/master@{#341175}
Diffstat (limited to 'device/vibration')
-rw-r--r--device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java b/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java
index 37dc1b2..0f12d7c 100644
--- a/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java
+++ b/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java
@@ -10,8 +10,8 @@ import android.media.AudioManager;
import android.os.Vibrator;
import android.util.Log;
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.JNINamespace;
/**
* This is the implementation of the C++ counterpart VibrationProvider.