summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Binder linkage no longer depends on JNI objrefs as persistent tokensChristopher Tate2011-02-281-1/+1
* Merge "You can now specify a custom display size as NxM."Dianne Hackborn2011-02-280-0/+0
|\
* \ Merge "The color conversion from YUV420Planar to RGB only requires the image ...James Dong2011-02-280-0/+0
|\ \
* \ \ am 71431bb5: am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() ...Jean-Baptiste Queru2011-02-280-0/+0
|\ \ \
| * \ \ am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaun...Jean-Baptiste Queru2011-02-280-0/+0
| |\ \ \
| | * \ \ am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTes...Jean-Baptiste Queru2011-02-280-0/+0
| | |\ \ \
| | | * \ \ am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."Jean-Baptiste Queru2011-02-280-0/+0
| | | |\ \ \
| | | | * \ \ Merge "Fix of tearDown() in SingleLaunchActivityTestCase."Jean-Baptiste Queru2011-02-280-0/+0
| | | | |\ \ \
* | | | | \ \ \ Merge "Fix for issue 3466385: Low quality video properties are applied to all"Santosh Madhava2011-02-280-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "These moved into developmnet samples"Alex Sakhartchouk2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Add the option '-S' to use surface allocated buffers in the stagefrigh...Andreas Huber2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant...Xavier Ducrohet2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-280-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-280-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-240-0/+0
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge "WAPPushManager, WAP Push over SMS message handler"Wink Saville2011-02-230-0/+0
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"Mike Lockwood2011-02-230-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge "Fixed GSM encoded network initiated position request"Brad Fitzpatrick2011-02-230-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Ensuring thread-safe usage of DateFormat."Elliott Hughes2011-02-220-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | * | | | | | | | | | Merge "Fix for an infinite loop while scrolling lists."Brad Fitzpatrick2011-02-220-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | * | | | | | | | | | Merge "Fixing infinite loop for zero duration."Brad Fitzpatrick2011-02-220-0/+0
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "Fix issue 3388354."Eric Laurent2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix bug 3376700 Volume too loud at lowest setting"Jean-Michel Trivi2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "No radio buttons on <select>"Leon Scroggins2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Instrumentation code to enable/disable memory leak check using setprop"Rajneesh Chowdury2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix for issue 3431967: Memory leak from video editor engine"Santosh Madhava2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Don't try to output really long URLs HTML5Audio exception handler."Ben Murdoch2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Bug 3447027 Limit previews for DRM video"Glenn Kasten2011-02-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "fix javadoc on downloadmanager.remove()"Vasu Nori2011-02-280-0/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | am 1649d91f: am a47ef32e: Merge "Doc change: Add announce for Android at GDC ...Dirk Dougherty2011-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into h...Dirk Dougherty2011-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Doc change: Add announce for Android at GDC 2011." into honeycombDirk Dougherty2011-02-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from usi...Jamie Gennis2011-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer toke...Jamie Gennis2011-02-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into g...Jamie Gennis2011-02-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbreadJamie Gennis2011-02-271-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Prevent SurfaceFlinger from using layer token 31.Jamie Gennis2011-02-101-1/+1
* | | | | | | | | | | | | | | | | | Merge "bug:3474580 fix javadoc"Vasu Nori2011-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Fix a regression matching intents when action doesn't matter."Jeff Brown2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Log errors reading input channel from parcel."Jeff Brown2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Make SHIFT+Backspace be forward delete."Jeff Brown2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Add scroll wheel support to TextView."Jeff Brown2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 710c510b: (-s ours) am 8719c406: DO NOT MERGE: MTP: Disable MTP when the k...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and s...Mike Lockwood2011-02-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynami...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removi...Mike Lockwood2011-02-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy &...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeygu...Mike Lockwood2011-02-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyg...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |