summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of a2d19318 to lmp-mr1-ub-devSebastien Hertz2015-08-211-6/+10
|\
| * am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-211-6/+10
| |\
| | * am ff8dc212: Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-211-6/+10
| | |\
| | | * Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-191-6/+10
* | | | am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-devLeon Scroggins III2015-06-121-2/+12
|\ \ \ \
| * \ \ \ resolved conflicts for merge of 3ff978a5 to cw-d-mr1-devLeon Scroggins III2015-06-101-2/+12
| |\ \ \ \
| | * \ \ \ am 77dde3cb: am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensu...Leon Scroggins III2015-06-101-1/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Regio...Leon Scroggins III2015-06-101-1/+6
| | | |\ \ \ | | | | |/ /
| | | | * | am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads ...Leon Scroggins III2015-06-021-1/+6
| | | | |\ \ | | | | | |/
| | | | | * DO NOT MERGE: Ensure that unparcelling Region only reads the expected number ...Leon Scroggins III2015-05-291-1/+6
| | * | | | am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the par...Leon Scroggins III2015-05-271-2/+6
| | |\ \ \ \ | |/ / / / / | | | _ / / | | | / /
| | * | | am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected...Leon Scroggins III2015-05-271-2/+6
| | |\ \ \ | | | |/ /
| | | * | am b36ace74: Merge "Check that the parcel contained the expected amount of re...Leon Scroggins III2015-05-271-2/+6
| | | |\ \ | | | | |/
| | | | * Check that the parcel contained the expected amount of region data. DO NOT MERGELeon Scroggins III2015-05-261-2/+6
* | | | | DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-devJohn Reck2015-05-142-20/+12
|\ \ \ \ \ | |/ / / /
| * | | | am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jan...John Reck2015-05-142-20/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into ...John Reck2015-05-142-20/+12
| | |\ \ \
| | | * | | Revert "DO NOT MERGE Backport of limited jank-tracking metrics"John Reck2015-05-132-20/+12
* | | | | | resolved conflicts for merge of e869835d to lmp-mr1-ub-devJohn Reck2015-05-132-12/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracki...John Reck2015-05-132-12/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-devJohn Reck2015-05-132-12/+20
| | |\ \ \ \ | | | |/ / /
| | | * | | DO NOT MERGE Backport of limited jank-tracking metricsJohn Reck2015-03-182-12/+20
* | | | | | am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_...Leon Scroggins III2015-04-241-7/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromPar...Leon Scroggins III2015-04-241-7/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count....Leon Scroggins III2015-04-241-7/+15
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGELeon Scroggins III2015-04-231-7/+15
| | | |\ \ | | | | |/
| | | | * Make Bitmap_createFromParcel check the color count. DO NOT MERGELeon Scroggins III2015-04-161-7/+15
| | | * | am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT...Natalie Silvanovich2015-02-191-1/+6
| | | |\ \ | | | | |/
| | | | * Check that bitmap's size does not exceed 32 bits. DO NOT MERGELeon Scroggins III2015-02-101-1/+6
| | | * | am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549:...Leon Scroggins III2015-01-271-1/+3
| | | |\ \ | | | | |/
| | | | * am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa:...Leon Scroggins III2015-01-271-1/+3
| | | | |\
| | | | | * am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad n...Leon Scroggins III2015-01-271-1/+3
| | | | | |\
| | | | | | * am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.Leon Scroggins III2015-01-271-1/+3
| | | | | | |\
| | | | | | | * am 01287549: am 9a6143fa: Handle bad ninepatch data.Leon Scroggins III2015-01-271-1/+3
| | | | | | | |\
| | | | | | | | * Handle bad ninepatch data.Leon Scroggins III2015-01-271-1/+3
| | | | | * | | | Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""Alan Lau2014-07-301-2/+2
| | | | | * | | | Revert "DO NOT MERGE Fix extraneous allocation and copying"Alan Lau2014-07-281-2/+2
| | | | | * | | | DO NOT MERGE Fix extraneous allocation and copyingAnish Athalye2014-07-281-2/+2
| | | | | * | | | DO NOT MERGE Implement line breaking using ICU break iteratorAnish Athalye2014-07-283-0/+113
| | | * | | | | | Wire up surface width/height to lockHardwareCanvas DO NOT MERGEJohn Reck2014-11-241-0/+18
| | | * | | | | | Frameworks/base: Compiled-classes supportAndreas Gampe2014-11-181-0/+16
| | | * | | | | | Surface:lockHardwareCanvas DO NOT MERGEJohn Reck2014-10-221-0/+56
| | | |/ / / / /
| * | | | | | | Frameworks/base: Support dex2oat threads system propertyAndreas Gampe2015-03-301-0/+5
| |/ / / / / /
* | | | | | | Merge "Load libraries directly from apk"Dmitriy Ivanov2015-04-072-9/+50
|\ \ \ \ \ \ \
| * | | | | | | Load libraries directly from apkDmitriy Ivanov2015-04-072-16/+53
* | | | | | | | Frameworks/base: Pass variant and feature-set to runtimeAndreas Gampe2015-04-031-7/+44
|/ / / / / / /
* | | | | | | Frameworks/base: Use system property for cache prune counterAndreas Gampe2015-04-011-0/+5
* | | | | | | Frameworks/base: Support dex2oat threads system propertyAndreas Gampe2015-03-301-0/+5
* | | | | | | Revert "Change jit properties to be debug properties"Mathieu Chartier2015-03-181-3/+3
* | | | | | | Merge "Change jit properties to be debug properties"Mathieu Chartier2015-03-171-3/+3
|\ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-25 06:05:23 +0000