summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Move frameworks/base over to libc++.Dan Albert2014-11-121-2/+0
* Merge "Prevent resource leak in YuvToJpegEncoder"Elliott Hughes2014-11-121-0/+1
|\
| * Prevent resource leak in YuvToJpegEncoderMartin Wallgren2014-11-111-0/+1
* | Merge "Frameworks/base: Right transform in DngCreator"Andreas Gampe2014-11-121-1/+1
|\ \
| * | Frameworks/base: Right transform in DngCreatorAndreas Gampe2014-11-111-1/+1
* | | Merge "Fix for CharSequenceCreator test case"Elliott Hughes2014-11-121-0/+1
|\ \ \
| * | | Fix for CharSequenceCreator test caseMattias Petersson2014-11-071-0/+1
| | |/ | |/|
* | | Merge "Frameworks/base: Fix FingerprintManager JNI"Andreas Gampe2014-11-111-1/+1
|\ \ \
| * | | Frameworks/base: Fix FingerprintManager JNIAndreas Gampe2014-11-111-1/+1
| | |/ | |/|
* | | Frameworks/base: Fix AssetManager JNIAndreas Gampe2014-11-111-1/+1
|/ /
* | Frameworks/base: Mask Skia warning in GraphicsJNIAndreas Gampe2014-11-101-0/+4
* | Merge "kill HAVE_INOTIFY"Yabin Cui2014-11-111-27/+23
|\ \
| * | kill HAVE_INOTIFYYabin Cui2014-11-101-27/+23
| |/
* | Merge "kill HAVE_SCHED_SETSCHEDULER"Yabin Cui2014-11-101-1/+2
|\ \
| * | kill HAVE_SCHED_SETSCHEDULERYabin Cui2014-11-101-1/+2
| |/
* | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-11-101-4/+15
|/
* am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-032-2/+2
|\
| * Merge "Track change to Conscrypt"Kenny Root2014-11-032-2/+2
| |\
| | * Track change to ConscryptKenny Root2014-10-312-2/+2
* | | am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
|\ \ \ | |/ /
| * | Add java.util.List import.Narayan Kamath2014-11-031-0/+1
* | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-77/+0
|\ \ \ | |/ /
| * | Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-77/+0
| |\ \ | | |/ | |/|
| | * Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-031-77/+0
* | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3073-6602/+7111
* | | am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."Vladimir Marko2014-10-291-1/+1
|\ \ \ | |/ /
| * | Fix android_media_AudioSystem_getMasterMute return type.Vladimir Marko2014-10-291-1/+1
* | | am 43a92646: Merge "Use native brige only if we have a private data directory."Calin Juravle2014-10-291-4/+8
|\ \ \ | |/ /
| * | Merge "Use native brige only if we have a private data directory."Calin Juravle2014-10-291-4/+8
| |\ \
| | * | Use native brige only if we have a private data directory.Calin Juravle2014-10-291-4/+8
* | | | am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+77
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-271-0/+77
| |\ \ \ | | | |/ | | |/|
| | * | Revert "Remove unused apache related API."Narayan Kamath2014-10-271-0/+77
* | | | resolved conflicts for merge of 9834af9c to stage-aosp-masterNarayan Kamath2014-10-291-35/+0
|\ \ \ \ | |/ / /
| * | | Merge "Remove unused apache related API."Narayan Kamath2014-10-271-77/+0
| |\ \ \ | | |/ /
| | * | Remove unused apache related API.Narayan Kamath2014-10-241-77/+0
* | | | am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"Calin Juravle2014-10-281-13/+13
|\ \ \ \ | |/ / /
| * | | Merge "PreInitializeNativeBridge only if its Available"Calin Juravle2014-10-271-13/+13
| |\ \ \ | | |/ / | |/| / | | |/
| | * PreInitializeNativeBridge only if its AvailableCalin Juravle2014-10-271-13/+13
* | | am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-282-5/+5
|\ \ \ | |/ /
| * | Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-232-5/+5
| |\ \ | | |/ | |/|
| | * Migrate off timeFormat12 and timeFormat24.Elliott Hughes2014-10-232-5/+5
* | | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-205-77/+147
|\ \ \
| * \ \ am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to M...Neil Fuller2014-10-205-77/+147
| |\ \ \ | | |/ /
| | * | Merge "Replacing FloatMath native implementation with calls to Math"Neil Fuller2014-10-205-77/+147
| | |\ \
| | | * | Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-205-77/+147
* | | | | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implement...Elliott Hughes2014-10-185-110/+69
|\ \ \ \ \ | |/ / / /
| * | | | am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with ca...Elliott Hughes2014-10-185-110/+69
| |\ \ \ \ | | |/ / /
| | * | | Merge "Revert "Replacing FloatMath native implementation with calls to Math""Elliott Hughes2014-10-185-110/+69
| | |\ \ \
| | | * | | Revert "Replacing FloatMath native implementation with calls to Math"Elliott Hughes2014-10-185-110/+69