summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use system property to control whether we will enable B frame support ...James Dong2011-06-171-1/+11
|\
| * Use system property to control whether we will enable B frame support in MPEG...James Dong2011-06-171-1/+11
* | Merge "Fix rendering issue with paths when the stroke width is 0"Romain Guy2011-06-174-7/+87
|\ \
| * | Fix rendering issue with paths when the stroke width is 0Romain Guy2011-06-174-7/+87
* | | Merge "Pass width/height specs in the standard way when measuring children."Philip Milne2011-06-172-44/+37
|\ \ \
| * | | Pass width/height specs in the standard way when measuring children.Philip Milne2011-06-172-44/+37
* | | | Merge "VpnDialogs: migrate to VpnConfig."Chia-chi Yeh2011-06-171-41/+43
|\ \ \ \
| * | | | VpnDialogs: migrate to VpnConfig.Chia-chi Yeh2011-06-171-41/+43
* | | | | Merge "Fix typo in docs link"RoboErik2011-06-171-1/+1
|\ \ \ \ \
| * | | | | Fix typo in docs linkRoboErik2011-06-171-1/+1
* | | | | | Merge "Make debuggable="true" imply CheckJNI."Elliott Hughes2011-06-171-0/+3
|\ \ \ \ \ \
| * | | | | | Make debuggable="true" imply CheckJNI.Elliott Hughes2011-06-171-0/+3
* | | | | | | Merge "Implement remaining infrastructure for user disabling apps."Dianne Hackborn2011-06-177-2/+55
|\ \ \ \ \ \ \
| * | | | | | | Implement remaining infrastructure for user disabling apps.Dianne Hackborn2011-06-177-2/+55
* | | | | | | | Merge "Add docs for Calendars table"RoboErik2011-06-171-13/+106
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Add docs for Calendars tableRoboErik2011-06-171-13/+106
* | | | | | | | Merge "VPN: move VpnDialogs related methods into VpnConfig."Chia-chi Yeh2011-06-172-27/+56
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | VPN: move VpnDialogs related methods into VpnConfig.Chia-chi Yeh2011-06-172-27/+56
* | | | | | | | Merge "Remove HanziToPinin.java"Daisuke Miyakawa2011-06-172-569/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove HanziToPinin.javaDaisuke Miyakawa2011-06-162-569/+0
* | | | | | | | | Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState"Adam Powell2011-06-171-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 4726236 - NPE at dispatchRestoreInstanceStateAdam Powell2011-06-171-1/+3
* | | | | | | | | | Merge "Inform the InputMethodManager that a focused view has been attached."Amith Yamasani2011-06-171-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Inform the InputMethodManager that a focused view has been attached.Amith Yamasani2011-06-171-0/+4
* | | | | | | | | | | Merge "Fix regression in audio effect factory"Eric Laurent2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix regression in audio effect factoryEric Laurent2011-06-161-1/+1
* | | | | | | | | | | Merge "Create theme attributes for small and large listPreferredItemHeight. C...Adam Powell2011-06-178-7/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Create theme attributes for small and largeAdam Powell2011-06-178-7/+24
* | | | | | | | | | | | Merge "POSITVE -> POSITIVE typo fix"Stephen Hines2011-06-174-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | POSITVE -> POSITIVE typo fixStephen Hines2011-06-164-15/+24
* | | | | | | | | | | | | Merge "Add isCompatible() to RS Element."Stephen Hines2011-06-172-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add isCompatible() to RS Element.Stephen Hines2011-06-172-2/+30
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix permissions check in IccSmsInterfaceManager.sendText()"David Brown2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix permissions check in IccSmsInterfaceManager.sendText()David Brown2011-06-171-1/+1
* | | | | | | | | | | | Merge "Add API for auto-complete ranking improvement."Daisuke Miyakawa2011-06-172-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add API for auto-complete ranking improvement.Daisuke Miyakawa2011-06-152-3/+11
* | | | | | | | | | | | | Merge "Make textZoom public"John Reck2011-06-172-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make textZoom publicJohn Reck2011-06-172-6/+11
* | | | | | | | | | | | | | Merge "ICS updates to notification layouts."Daniel Sandler2011-06-1713-160/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ICS updates to notification layouts.Daniel Sandler2011-06-1713-160/+131
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Avoid clobbering UID stats when not yet loaded."Jeff Sharkey2011-06-171-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Avoid clobbering UID stats when not yet loaded.Jeff Sharkey2011-06-171-2/+6
* | | | | | | | | | | | | | | Merge "Change includeMarginsInAlignment flag to aligmentMode property."Philip Milne2011-06-176-51/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change includeMarginsInAlignment flag to aligmentMode property.Philip Milne2011-06-166-51/+101
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | hide CalendarMetaDataColumnsRoboErik2011-06-171-2/+4
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Add textZoom setting"John Reck2011-06-171-8/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add textZoom settingJohn Reck2011-06-171-8/+41
* | | | | | | | | | | | | | Merge "SurfaceTexture: enable a test that now passes."Jamie Gennis2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | SurfaceTexture: enable a test that now passes.Jamie Gennis2011-06-151-1/+1
* | | | | | | | | | | | | | | Merge "SurfaceTexture: enable a test that is now passing."Jamie Gennis2011-06-171-14/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | / / / / / / / / / / | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |