diff options
| author |   The Android Open Source Project <initial-contribution@android.com> | 2012-07-31 08:28:44 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-07-31 08:28:44 -0700 |
| commit | aeffee1111f7ba4069396f8ad3171c9f1948a45c (patch) | |
| tree | 789823bd0d618e5b70f32d1682b414f0631a6950 /native/jni/src/proximity_info_state.cpp | |
| parent | 25dc433bdade4154162a4f982cf8b2f9a001dfa8 (diff) | |
| parent | df3f09c2e7fab17fe39b52fc9da99ac6da3647dc (diff) | |
| download | latinime-aeffee1111f7ba4069396f8ad3171c9f1948a45c.tar.gz latinime-aeffee1111f7ba4069396f8ad3171c9f1948a45c.tar.xz latinime-aeffee1111f7ba4069396f8ad3171c9f1948a45c.zip | |
am df3f09c2: Sync with jb-mr1-dev
* commit 'df3f09c2e7fab17fe39b52fc9da99ac6da3647dc':
Add <uses-sdk> in manifest files of test apks
Cancel the while-typing timer when user hits the spacebar
Cleanup headers
Add language switch key to 10" tablet
Add a <uses-sdk> element in the LatinIME's manifest
Add android::supportsRtl="true"
Fix east slavic keyboard layouts
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 3 |
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" |