summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "rework SystemSensorManager.java"Mathias Agopian2013-02-061-86/+157
|\
| * rework SystemSensorManager.javaMathias Agopian2013-02-041-86/+157
* | Merge "Changes needed to roll Skia to r7527." into master-chromiumDerek Sollenberger2013-02-051-1/+1
|\ \
| * | Changes needed to roll Skia to r7527.Derek Sollenberger2013-02-041-1/+1
* | | am c24b1448: Merge "Don\'t mark recycled bitmaps as immutable"Michael Jurka2013-02-041-1/+1
|\ \ \ | |/ / |/| |
| * | Merge "Don't mark recycled bitmaps as immutable"Michael Jurka2013-02-041-1/+1
| |\ \
| | * | Don't mark recycled bitmaps as immutableMichael Jurka2013-02-041-1/+1
* | | | am 1bce2db3: Merge "Fix return type mismatch in Region\'s JNI code."Derek Sollenberger2013-02-041-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix return type mismatch in Region's JNI code."Derek Sollenberger2013-02-041-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix return type mismatch in Region's JNI code.Derek Sollenberger2013-02-011-1/+1
| | |/
* | | am c5801680: Merge "Tag HardwareRenderers with a name to help debugging"Romain Guy2013-01-311-0/+13
|\ \ \ | |/ /
| * | Tag HardwareRenderers with a name to help debuggingRomain Guy2013-01-311-0/+13
* | | resolved conflicts for merge of c93c6aa5 to master-chromiumDerek Sollenberger2013-01-301-1/+1
|\ \ \ | |/ /
| * | Merge "Object-based DisplayList recording"Chris Craik2013-01-301-1/+1
| |\ \
| | * | Object-based DisplayList recordingChris Craik2013-01-221-1/+1
* | | | am 4ec799d4: Merge "Remove dead code."Nick Kralevich2013-01-301-28/+0
|\ \ \ \ | |/ / /
| * | | Remove dead code.Nick Kralevich2013-01-301-28/+0
| | |/ | |/|
* | | am 5988335a: Merge "Optimize Looper JNI code."Jeff Brown2013-01-281-32/+11
|\ \ \ | |/ /
| * | Optimize Looper JNI code.Jeff Brown2013-01-281-32/+11
| |/
* | am 5a0252da: Merge changes Ib8b18f1b,I0d799d82,Ia6222322Jeff Sharkey2013-01-171-1/+11
|\ \ | |/
| * Add method to get process group.Jeff Sharkey2013-01-171-1/+11
* | am 54298652: Merge "Reduce TextLayoutCache logging."Jeff Sharkey2013-01-171-0/+2
|\ \ | |/
| * Reduce TextLayoutCache logging.Jeff Sharkey2013-01-171-0/+2
* | am 6d191ed9: Added the necessary Harfbuzz scripts for rendering Japanese text...Junichi Monma2013-01-171-0/+3
|\ \ | |/
| * Added the necessary Harfbuzz scripts for rendering Japanese text correctly.Junichi Monma2013-01-171-0/+3
* | am 2d76d4f3: Fix build break in master-chromiumKristian Monsen2013-01-151-2/+3
|\ \ | |/
| * Fix build break in master-chromiumKristian Monsen2013-01-151-2/+3
* | am e45113a1: Merge "Attempt to resolve build breakage on x86"Raph Levien2013-01-151-2/+2
|\ \ | |/
| * Attempt to resolve build breakage on x86Raph Levien2013-01-151-2/+2
* | am 7cd0859a: Merge "Update framework text layout to use Harfbuzz NG"Raph Levien2013-01-156-574/+480
|\ \ | |/
| * Merge "Update framework text layout to use Harfbuzz NG"Raph Levien2013-01-156-574/+480
| |\
| | * Update framework text layout to use Harfbuzz NGRaph Levien2013-01-156-574/+480
* | | am 61840eb0: Merge "Preliminary Support for region clipping"Romain Guy2013-01-151-0/+12
|\ \ \ | |/ /
| * | Preliminary Support for region clippingRomain Guy2013-01-141-0/+12
| |/
* | am a268ba51: Merge "Up our DNS server support from 2 > 4"Robert Greenwalt2013-01-111-8/+18
|\ \ | |/
| * Merge "Up our DNS server support from 2 > 4"Robert Greenwalt2013-01-111-8/+18
| |\
| | * Up our DNS server support from 2 > 4Robert Greenwalt2013-01-111-8/+18
* | | Remove calls to SkCanvas::setBitmapDevice()Derek Sollenberger2013-01-083-33/+51
* | | am 9acd1b4f: Merge "Add visual profiling feature"Romain Guy2013-01-041-7/+32
|\ \ \ | |/ /
| * | Add visual profiling featureRomain Guy2013-01-041-7/+32
| |/
* | am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing"Siva Velusamy2013-01-021-3/+3
|\ \ | |/
| * Merge "DdmServer: add controls for OpenGL tracing"Siva Velusamy2013-01-021-3/+3
| |\
| | * DdmServer: add controls for OpenGL tracingSiva Velusamy2012-12-191-3/+3
* | | am e2d3156b: am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possi...Elliott Hughes2012-12-281-0/+1
|\ \ \ | |/ /
| * | am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"Elliott Hughes2012-12-281-0/+1
| |\ \
| | * | StringBlock_nativeCreate: Possible LeakYou Kim2012-12-211-0/+1
* | | | am d07d7fd0: am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_...Victoria Lease2012-12-201-9/+5
|\ \ \ \ | |/ / /
| * | | am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_...Victoria Lease2012-12-201-9/+5
| |\ \ \ | | |/ /
| | * | Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
| | |\ \
| | | * | Possible leak in android_emoji_EmojiFactory_newInstanceYou Kim2012-12-121-9/+5