aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info_state.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-31 07:52:42 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-31 07:52:42 -0700
commitdf3f09c2e7fab17fe39b52fc9da99ac6da3647dc (patch)
tree789823bd0d618e5b70f32d1682b414f0631a6950 /native/jni/src/proximity_info_state.cpp
parentbe3eebf774a9a443eb9dc895d26e3157c98b210e (diff)
parent8ec8c5fedac52352a4086fd05922fa57466b4dee (diff)
downloadlatinime-df3f09c2e7fab17fe39b52fc9da99ac6da3647dc.tar.gz
latinime-df3f09c2e7fab17fe39b52fc9da99ac6da3647dc.tar.xz
latinime-df3f09c2e7fab17fe39b52fc9da99ac6da3647dc.zip
Sync with jb-mr1-dev
Change-Id: I6bc4664468cb2f0b3c55e42859b5fe86231a1b2f
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
-rw-r--r--native/jni/src/proximity_info_state.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp
index d481a3bc7..04a201712 100644
--- a/native/jni/src/proximity_info_state.cpp
+++ b/native/jni/src/proximity_info_state.cpp
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include <assert.h>
+#include <cassert>
#include <stdint.h>
-#include <string>
#define LOG_TAG "LatinIME: proximity_info_state.cpp"