summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add animations along a Path."George Mount2013-11-201-1/+194
|\
| * Add animations along a Path.George Mount2013-11-201-1/+194
* | Merge "Initial integration of Minikin to framework"Raph Levien2013-11-188-113/+571
|\ \
| * | Initial integration of Minikin to frameworkRaph Levien2013-11-188-113/+571
| |/
* | Merge "More refactoring"John Reck2013-11-113-19/+19
|\ \
| * | More refactoringJohn Reck2013-11-113-19/+19
| |/
* | am 5c1aa4ef: am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) c...Elliott Hughes2013-11-071-25/+0
|\ \
| * \ am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."Elliott Hughes2013-11-071-25/+0
| |\ \
| | * | Remove incorrect (and unused) capget code.Elliott Hughes2013-11-071-25/+0
* | | | Merge "Disable unused parameter warning for jni code"Michael Wright2013-11-081-0/+1
|\ \ \ \
| * | | | Disable unused parameter warning for jni codeMichael Wright2013-11-071-0/+1
| | |_|/ | |/| |
* | | | am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF gene...Svetoslav2013-11-071-34/+110
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs."...Svetoslav2013-11-071-34/+110
| |\ \
| | * | Switch to the new Skia PDF generation APIs.Svetoslav2013-11-071-34/+110
* | | | am dd3776d6: am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typefac...Victoria Lease2013-11-061-2/+14
|\ \ \ \ | |/ / /
| * | | am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) sem...Victoria Lease2013-11-061-2/+14
| |\ \ \ | | |/ /
| | * | Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into...Victoria Lease2013-11-061-2/+14
| | |\ \
| | | * | Fix for Typeface.create(Typeface, style) semantics changed in KKRaph Levien2013-11-061-2/+14
* | | | | resolved conflicts for merge of ed84dea9 to masterElliott Hughes2013-10-292-8/+12
|\ \ \ \ \ | |/ / / /
| * | | | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-292-8/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-292-8/+12
* | | | | am 0116f08b: am 961cc671: am 3f836741: Merge "Speculatively schedule input co...Michael Wright2013-10-291-9/+21
|\ \ \ \ \ | |/ / / /
| * | | | am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" in...Michael Wright2013-10-291-9/+21
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Speculatively schedule input consumption" into klp-devMichael Wright2013-10-291-9/+21
| | |\ \ \
| | | * | | Speculatively schedule input consumptionMichael Wright2013-10-261-9/+21
| | | | |/ | | | |/|
* | | | | am ee46eab2: am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier de...Igor Murashkin2013-10-251-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into...Igor Murashkin2013-10-251-0/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge "Trace: add ALOGVs for easier debugging" into klp-devIgor Murashkin2013-10-251-0/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Trace: add ALOGVs for easier debuggingIgor Murashkin2013-10-171-0/+15
* | | | | am ed82a648: am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSU...Victoria Lease2013-10-211-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing"...Victoria Lease2013-10-211-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Implement language-specific GSUB processing" into klp-devVictoria Lease2013-10-211-1/+2
| | |\ \ \
| | | * | | Implement language-specific GSUB processingRaph Levien2013-10-081-1/+2
* | | | | | am 9f13a608: am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after cas...Elliott Hughes2013-10-181-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts."Elliott Hughes2013-10-181-3/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix whitespace issues after casts.Mathieu Chartier2013-10-181-3/+3
| * | | | | am 4a5b3f0a: am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayEl...Elliott Hughes2013-10-181-6/+21
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove dependency on jniGetNonMovableArrayElements.Mathieu Chartier2013-10-181-6/+21
* | | | | | Remove dependency on jniGetNonMovableArrayElements.Mathieu Chartier2013-10-181-6/+21
* | | | | | am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device U...Jeff Sharkey2013-10-173-73/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label...Jeff Sharkey2013-10-173-73/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Plumb through physical device UUID and label.Jeff Sharkey2013-10-163-73/+0
| | | |_|/ | | |/| |
* | | | | am 1f5da180: am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a point...Nick Kralevich2013-10-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"Nick Kralevich2013-10-141-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | core: fix arithmetic on a pointer to voidsynergydev2013-10-141-1/+1
* | | | | am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush ...Aravind Akella2013-10-101-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into k...Aravind Akella2013-10-101-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix registerListener and flush bugs." into klp-devAravind Akella2013-10-111-3/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix registerListener and flush bugs.Aravind Akella2013-10-091-3/+3
* | | | | Handle null thread name more gracefully in javaCreateThreadEtc()Mike Lockwood2013-10-101-1/+2