summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related class...Narayan Kamath2014-01-313-167/+177
|\
| * AArch64: Make AssetManager and related classes 64-bit compatibleAshok Bhat2014-01-313-167/+177
* | am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set prod...Igor Murashkin2014-01-311-1/+1
|\ \ | |/
| * Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"Igor Murashkin2014-01-311-1/+1
| |\
| | * EGL14.eglCreateWindowSurface should set producerControlledByAppTakahiro Aizawa2013-12-181-1/+1
* | | am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...Narayan Kamath2014-01-311-12/+12
|\ \ \ | |/ /
| * | Merge "AArch64: Use of long for pointers in PropertyValuesHolder"Narayan Kamath2014-01-301-12/+12
| |\ \
| | * | AArch64: Use of long for pointers in PropertyValuesHolderAshok Bhat2014-01-291-12/+12
* | | | am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"Narayan Kamath2014-01-311-1/+2
|\ \ \ \ | |/ / /
| * | | change Surface constructor arg to 64bitChong Zhang2014-01-301-1/+2
* | | | am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."Nick Kralevich2014-01-311-1/+14
|\ \ \ \ | |/ / /
| * | | Map SELinux log levels to Android log levels.Stephen Smalley2014-01-291-1/+14
* | | | am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."Narayan Kamath2014-01-291-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "mNativeCanvas is long, not int."Narayan Kamath2014-01-291-1/+1
| |\ \ \
| | * | | mNativeCanvas is long, not int.Narayan Kamath2014-01-291-1/+1
| | |/ /
* | | | am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-291-14/+19
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Use long for pointers in graphics/Interpolator"Narayan Kamath2014-01-291-14/+19
| |\ \ \
| | * | | AArch64: Use long for pointers in graphics/InterpolatorAshok Bhat2014-01-161-14/+19
* | | | | am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-291-11/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AArch64: Use long for pointers in SurfaceTexture"Narayan Kamath2014-01-291-11/+11
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | AArch64: Use long for pointers in SurfaceTextureAshok Bhat2014-01-161-11/+11
| | |/ /
* | | | am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel...Narayan Kamath2014-01-292-99/+99
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Make Binder and Parcel 64-bit compatible"Narayan Kamath2014-01-292-99/+99
| |\ \ \
| | * | | AArch64: Make Binder and Parcel 64-bit compatibleAshok Bhat2014-01-232-99/+99
* | | | | am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4dbMark Salyzyn2014-01-281-43/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge changes I3659193f,I8b78e4dbMark Salyzyn2014-01-281-43/+41
| |\ \ \ \
| | * | | | jni: Resolve build warningsMark Salyzyn2014-01-271-4/+9
| | * | | | jni: Incorporate liblog reading APIMark Salyzyn2014-01-271-39/+32
* | | | | | am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-281-28/+46
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AArch64: Use long for pointers in graphics/CameraAshok Bhat2014-01-281-28/+46
* | | | | | am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes ...Narayan Kamath2014-01-2828-1449/+2102
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-2828-1449/+2102
* | | | | | am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix....Mathieu Chartier2014-01-271-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix dest == src bugs in Matrix.cpp."Mathieu Chartier2014-01-271-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix dest == src bugs in Matrix.cpp.Mathieu Chartier2014-01-251-6/+6
| | |/ / /
* | | | | am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be ...Narayan Kamath2014-01-271-6/+7
|\ \ \ \ \ | |/ / / /
| * | | | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-6/+7
| |/ / /
* | | | am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."Elliott Hughes2014-01-181-1/+1
|\ \ \ \ | |/ / /
| * | | Don't confuse stat and stat64.Elliott Hughes2014-01-171-1/+1
* | | | am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."Narayan Kamath2014-01-171-4/+5
|\ \ \ \ | |/ / /
| * | | Fix error checking in MemoryFile.Narayan Kamath2014-01-161-4/+5
| |/ /
* | | am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-164-38/+38
|\ \ \ | |/ /
| * | Merge "AArch64: Use long for pointers in view/input classes"Narayan Kamath2014-01-164-38/+38
| |\ \
| | * | AArch64: Use long for pointers in view/input classesAshok Bhat2014-01-094-38/+38
* | | | am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-161-14/+14
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Use long for pointers in android/os/MessageQueue"Narayan Kamath2014-01-161-14/+14
| |\ \ \
| | * | | AArch64: Use long for pointers in android/os/MessageQueueAshok Bhat2014-01-101-14/+14
| | |/ /
* | | | am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-161-36/+62
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Use long for pointers in graphics/PathMeasure"Narayan Kamath2014-01-161-36/+62
| |\ \ \
| | * | | AArch64: Use long for pointers in graphics/PathMeasureAshok Bhat2014-01-131-36/+62
| | |/ /