summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the...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 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT M...Craig Mautner2015-03-043-27/+13
| | | | |\ \ | | | | | |/
| | | | | * Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lm...Craig Mautner2015-03-043-27/+13
| | | | | |\
| | | | | | * Do not make ActivityContainer available to apps. DO NOT MERGECraig Mautner2015-02-193-27/+13
* | | | | | | am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)Mark Renouf2015-04-241-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixes rejected dismiss gestures (framework version of ag/677161)Mark Renouf2015-04-241-5/+7
* | | | | | | am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags ...Svet Ganov2015-04-232-5/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating...Svet Ganov2015-04-232-5/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget c...Svet Ganov2015-04-232-5/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | DO NOT MERGE Don't take flags when creating app widget config activity.Svet Ganov2015-04-202-5/+4
* | | | | | | am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be total...Justin Koh2015-04-221-0/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset durin...Justin Koh2015-04-221-0/+6
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.ztenghui2015-04-211-0/+6
* | | | | | | | am 23606598: DO NOT MERGE: Reset the Node status when clone.ztenghui2015-04-221-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | DO NOT MERGE: Reset the Node status when clone.ztenghui2015-04-211-1/+2
| |/ / / / / /
* | | | | | | am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"Andreas Gampe2015-04-211-7/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Frameworks/base: Compile-time optimize SQLiteConnection"Andreas Gampe2015-04-211-7/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Frameworks/base: Compile-time optimize SQLiteConnectionAndreas Gampe2015-04-211-7/+10
* | | | | | | | | am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"Mathieu Chartier2015-04-211-6/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Update getExportedPropertyMethods to new reflection API"Mathieu Chartier2015-04-211-6/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Update getExportedPropertyMethods to new reflection APIMathieu Chartier2015-04-211-6/+2
* | | | | | | | | am 189d2785: Merge "Frameworks/base: Fix comment"Andreas Gampe2015-04-211-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Frameworks/base: Fix commentAndreas Gampe2015-04-211-5/+5
* | | | | | | | | am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"Andreas Gampe2015-04-211-1/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Frameworks/base: Use better Class.forName in ZygoteInitAndreas Gampe2015-04-201-1/+6
* | | | | | | | | am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected c...Sean Wan2015-04-172-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable."...Sean Wan2015-04-172-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | DO NOT MERGE: Make wifi scan interval when disconnected configurable.Sean Wan2015-04-172-0/+4
* | | | | | | | | | am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"Dmitriy Ivanov2015-04-171-1/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"Dmitriy Ivanov2015-04-171-1/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONSDmitriy Ivanov2015-04-171-1/+0
* | | | | | | | | | | am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."Martijn Coenen2015-04-173-11/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Expose peer LLCP version in NDEF callbacks."Martijn Coenen2015-04-173-11/+17
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Expose peer LLCP version in NDEF callbacks.Martijn Coenen2015-04-153-11/+17
* | | | | | | | | | | am 4544b927: Hold a wake lock while dozing when wallpaper draws.Filip Gruszczynski2015-04-171-3/+20
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Hold a wake lock while dozing when wallpaper draws.Filip Gruszczynski2015-04-161-3/+20
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-105-15/+15
* | | | | | | | | | am e5e49a17: Merge "Support KM_LONG_REP"Chad Brubaker2015-04-163-2/+28
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Support KM_LONG_REP"Chad Brubaker2015-04-163-2/+28
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Support KM_LONG_REPChad Brubaker2015-04-163-2/+28
* | | | | | | | | | am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-141-2/+2
* | | | | | | | | | | am b9a78c79: Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add IV-related Keymaster error codes.Alex Klyubin2015-04-151-0/+4