summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix nativeGetAnimationFrameStats to use the correct times."Allen Hair2014-04-251-1/+1
|\
| * Fix nativeGetAnimationFrameStats to use the correct times.Allen Hair2014-04-241-1/+1
* | am fc02fcc8: am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bi...Mark Salyzyn2014-04-241-16/+17
|\ \
| * \ am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"Mark Salyzyn2014-04-241-16/+17
| |\ \
| | * | jni: android_util_Process 64 bit issuesMark Salyzyn2014-04-241-16/+17
* | | | Merge "Add floats-only drawRoundRect to Canvas"Chris Craik2014-04-241-5/+4
|\ \ \ \
| * | | | Add floats-only drawRoundRect to CanvasChris Craik2014-04-241-5/+4
* | | | | Merge "Bug fix for wakeup sensors."Aravind Akella2014-04-241-3/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug fix for wakeup sensors.Aravind Akella2014-04-231-3/+2
| | |_|/ | |/| |
* | | | Clip TouchFeedbackDrawable effect to receiver OutlineChris Craik2014-04-231-5/+4
|/ / /
* | | am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex...Michael Kolb2014-04-181-2/+2
|\ \ \ | |/ /
| * | am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"Mark Salyzyn2014-04-181-2/+2
| |\ \ | | |/
| | * jni: binder ptrdiff_t compile issuesMark Salyzyn2014-04-171-2/+2
* | | am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"Mark Salyzyn2014-04-171-9/+10
|\ \ \ | |/ /
| * | am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"Mark Salyzyn2014-04-171-9/+10
| |\ \ | | |/
| | * jni: binder 64-bit compile issuesMark Salyzyn2014-04-171-9/+10
* | | Merge changes Ia693f512,If3b7d41fRaph Levien2014-04-171-2/+42
|\ \ \
| * | | Add elegantTextHeight text appearance attributeRaph Levien2014-04-171-2/+42
* | | | Merge "Call SkShader::isOpaque() to determine opaqueness."Leon Scroggins2014-04-171-7/+7
|\ \ \ \
| * | | | Call SkShader::isOpaque() to determine opaqueness.Skia_Android Canary Bot2014-04-171-7/+7
* | | | | Merge "Add missing resume() call"John Reck2014-04-171-15/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing resume() callJohn Reck2014-04-161-15/+0
| |/ / /
* | | | am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-163-10/+15
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-163-10/+15
| |\ \ | | |/
| | * frameworks: 64 bit compile issuesMark Salyzyn2014-04-163-10/+15
* | | Merge "Fix issue with bitmap uploading"John Reck2014-04-142-4/+4
|\ \ \
| * | | Fix issue with bitmap uploadingJohn Reck2014-04-142-4/+4
* | | | Fence on destructionJohn Reck2014-04-141-3/+3
|/ / /
* | | Merge "Simplify matrix calculations"John Reck2014-04-111-5/+3
|\ \ \
| * | | Simplify matrix calculationsJohn Reck2014-04-111-5/+3
* | | | am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to Se...Aravind Akella2014-04-111-1/+12
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.j...Aravind Akella2014-04-111-1/+12
| |\ \
| | * \ Merge "Add stringType and requiredPermissions to SensorManager.java, as well ...Aravind Akella2014-04-111-1/+12
| | |\ \
| | | * | Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Aravind Akella2014-04-111-1/+12
| | * | | Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into...Adam Hampson2014-04-081-7/+0
| | |\ \ \
| | | * | | DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.Narayan Kamath2014-04-071-7/+0
| | | |/ /
| | * | | DO NOT MERGE Fix several bad function definitions.Narayan Kamath2014-04-042-9/+10
* | | | | Merge "Make attachFunctor blocking"John Reck2014-04-101-16/+0
|\ \ \ \ \
| * | | | | Make attachFunctor blockingJohn Reck2014-04-101-16/+0
* | | | | | Merge "Adding render stats APIs to UiAutomation (framework)."Svetoslav2014-04-101-0/+177
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding render stats APIs to UiAutomation (framework).Svetoslav2014-04-071-0/+177
* | | | | | resolved conflicts for merge of 286a247e to masterNarayan Kamath2014-04-101-80/+209
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-101-80/+209
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Re-implement native library search and copies."Narayan Kamath2014-04-101-80/+209
| | |\ \ \ \
| | | * | | | Re-implement native library search and copies.Ramin Zaghi2014-04-091-80/+209
* | | | | | | Merge hasFunctors & pushStaging into prepareTreeJohn Reck2014-04-092-4/+6
* | | | | | | Merge "Switch DisplayListData to a staging model"John Reck2014-04-093-209/+192
|\ \ \ \ \ \ \
| * | | | | | | Switch DisplayListData to a staging modelJohn Reck2014-04-093-209/+192
* | | | | | | | Merge "Fix ThreadedRenderer.setEnabled()"John Reck2014-04-091-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ThreadedRenderer.setEnabled()John Reck2014-04-091-2/+13
| |/ / / / / / /