summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add remotable methods for TextView's compound drawables."Daniel Sandler2012-03-263-0/+89
|\
| * Add remotable methods for TextView's compound drawables.Daniel Sandler2012-03-243-0/+89
* | Merge "Skip layout if performShow fails."Craig Mautner2012-03-254-5/+58
|\ \
| * | Skip layout if performShow fails.Craig Mautner2012-03-254-5/+58
* | | Support UntranslatableReplacementStringInSubtypeNamesatok2012-03-261-1/+15
* | | remove jni.h include from IOMX.hColin Cross2012-03-241-2/+0
* | | Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files."James Dong2012-03-2413-21/+0
|\ \ \
| * | | Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-2413-21/+0
* | | | Fixed missing return value from a method should have returned status_tJames Dong2012-03-241-1/+1
|/ / /
* | | Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus c...James Dong2012-03-241-77/+0
|\ \ \
| * | | VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be d...James Dong2012-03-241-77/+0
* | | | Merge "Destroy the hardware renderer when ViewRootImpl's die is post-poned Bu...Romain Guy2012-03-237-54/+48
|\ \ \ \
| * | | | Destroy the hardware renderer when ViewRootImpl's die is post-ponedRomain Guy2012-03-237-54/+48
* | | | | Merge "Insert 2 seconds wait in each test case setup. This is the work around...Yu Shan Emily Lau2012-03-233-2/+12
|\ \ \ \ \
| * | | | | Insert 2 seconds wait in each test case setup.Yu Shan Emily Lau2012-03-233-2/+12
* | | | | | Merge "Don't crash when wiping backup data redundantly in the local transport"Christopher Tate2012-03-232-3/+8
|\ \ \ \ \ \
| * | | | | | Don't crash when wiping backup data redundantly in the local transportChristopher Tate2012-03-232-3/+8
* | | | | | | Merge "Copy EXTRA_STREAM into ClipData and grant."Jeff Sharkey2012-03-233-0/+51
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Copy EXTRA_STREAM into ClipData and grant.Jeff Sharkey2012-03-233-0/+51
* | | | | | | Merge "move ndk headers to frameworks/native"Mathias Agopian2012-03-2316-3050/+1
|\ \ \ \ \ \ \
| * | | | | | | move ndk headers to frameworks/nativeMathias Agopian2012-03-2316-3050/+1
* | | | | | | | Merge "Add Delegate for ViewRootImpl#isInTouchMode to prevent IPC call in Ecl...Xavier Ducrohet2012-03-233-4/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Delegate for ViewRootImpl#isInTouchMode to prevent IPC call in Eclipse.Xavier Ducrohet2012-03-233-4/+49
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Reset layout needed at each animation step."Craig Mautner2012-03-233-24/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Reset layout needed at each animation step.Craig Mautner2012-03-233-24/+51
* | | | | | | | | Merge "Add getSizeBytes and cleanup docs."Jason Sams2012-03-231-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add getSizeBytes and cleanup docs.Jason Sams2012-03-231-2/+13
* | | | | | | | | | Merge "Cleanup Allocation docs and getter funcs."Jason Sams2012-03-231-0/+39
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Cleanup Allocation docs and getter funcs.Jason Sams2012-03-231-0/+39
* | | | | | | | | | Merge "Provide an API for enabling foreign key constraints."Jeff Brown2012-03-236-2/+129
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Provide an API for enabling foreign key constraints.Jeff Brown2012-03-236-2/+129
* | | | | | | | | | | Merge "Include GIDs for unenforced permissions."Jeff Sharkey2012-03-234-4/+85
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Include GIDs for unenforced permissions.Jeff Sharkey2012-03-234-4/+85
* | | | | | | | | | Merge "Add new thumbnail animation."Dianne Hackborn2012-03-2319-49/+598
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Add new thumbnail animation.Dianne Hackborn2012-03-2319-49/+598
* | | | | | | | | | Merge "add missing include"Mathias Agopian2012-03-231-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add missing includeMathias Agopian2012-03-231-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-232-12/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-232-12/+12
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-231-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "frameworks/base: remove build/ and dalvik heaps"Dima Zavin2012-03-235-90/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | frameworks/base: remove build/ and dalvik heapsDima Zavin2012-03-235-90/+0
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-2349-226/+275
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-2349-226/+275
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Revert "Split libmedia into libmedia and libmedia_native""Glenn Kasten2012-03-232-44/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-232-44/+37
* | | | | | | | | | | | Merge "Revert "AudioFlinger does not need libmedia any more""Glenn Kasten2012-03-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "AudioFlinger does not need libmedia any more"Glenn Kasten2012-03-231-0/+1
* | | | | | | | | | | | | Merge "Deal gracefully with fatal exceptions during full backup"Christopher Tate2012-03-231-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |