diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 10:36:14 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 10:36:14 -0800 |
| commit | 7d13d9db1ef90063cb542ccd6554042a6a3263b7 (patch) | |
| tree | 087eaefffcd35f9c4968408ea80080cda39e22ac /core/jni/android/graphics/Matrix.h | |
| parent | 935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97 (diff) | |
| parent | 3fc5e3cabfd9787e722b7720eabbcbba49984a94 (diff) | |
| download | frameworks_base-7d13d9db1ef90063cb542ccd6554042a6a3263b7.zip frameworks_base-7d13d9db1ef90063cb542ccd6554042a6a3263b7.tar.gz frameworks_base-7d13d9db1ef90063cb542ccd6554042a6a3263b7.tar.bz2 | |
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
Diffstat (limited to 'core/jni/android/graphics/Matrix.h')
| -rw-r--r-- | core/jni/android/graphics/Matrix.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android/graphics/Matrix.h b/core/jni/android/graphics/Matrix.h index 31edf88..11c9e72 100644 --- a/core/jni/android/graphics/Matrix.h +++ b/core/jni/android/graphics/Matrix.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _ANDROID_GRAPHICS_MATRIX_H -#define _ANDROID_GRAPHICS_MATRIX_H +#ifndef _ANDROID_GRAPHICS_MATRIX_H_ +#define _ANDROID_GRAPHICS_MATRIX_H_ #include "jni.h" #include "SkMatrix.h" @@ -27,4 +27,4 @@ extern SkMatrix* android_graphics_Matrix_getSkMatrix(JNIEnv* env, jobject matrix } // namespace android -#endif // _ANDROID_GRAPHICS_MATRIX_H +#endif // _ANDROID_GRAPHICS_MATRIX_H_ |