summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "When in the Choose Account flow if the accounts list display was initi...Fred Quintana2011-11-161-1/+15
|\
| * When in the Choose Account flow if the accounts list display was initiallyFred Quintana2011-11-151-1/+15
* | am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." i...Jeff Brown2011-11-152-4/+21
|\ \
| * \ Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-152-4/+21
| |\ \
| | * | Eliminate hw.keyboards system properties.Jeff Brown2011-11-152-4/+21
* | | | am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
|\ \ \ \ | |/ / /
| * | | Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
| |\ \ \
| | * | | Clean-up in TextViewGilles Debunne2011-11-101-28/+3
* | | | | am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" ...John Reck2011-11-151-13/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Call onScrollChanged when scrolling layers" into ics-mr1John Reck2011-11-151-13/+15
| |\ \ \ \
| | * | | | Call onScrollChanged when scrolling layersJohn Reck2011-11-141-13/+15
* | | | | | am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." into...Wu-cheng Li2011-11-151-7/+36
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Improve camera face detection javadoc." into ics-mr1Wu-cheng Li2011-11-151-7/+36
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Improve camera face detection javadoc.Wu-cheng Li2011-11-151-7/+36
* | | | | | am 642de92b: am 9058435d: Merge "Fix races when content providers are acquire...Jeff Brown2011-11-151-134/+190
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix races when content providers are acquired and released.Jeff Brown2011-11-141-134/+190
* | | | | | am f2213aca: am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" ...Daisuke Miyakawa2011-11-151-0/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Allow ContactsProvider to remove dulicates" into ics-mr1Daisuke Miyakawa2011-11-141-0/+10
| |\ \ \ \ \
| | * | | | | Allow ContactsProvider to remove dulicatesDaisuke Miyakawa2011-11-141-0/+10
| | | |/ / / | | |/| | |
* | | | | | am 621f9716: am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setW...Adam Cohen2011-11-141-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 561...Adam Cohen2011-11-141-0/+3
| |\ \ \ \ \
| | * | | | | Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)Adam Cohen2011-11-141-0/+3
* | | | | | | am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues...Dave Burke2011-11-145-41/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Revert "Discard framebuffer rendering queues when discarding layers"Dave Burke2011-11-145-41/+2
| | |/ / / | |/| | |
* | | | | am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when di...Mathias Agopian2011-11-145-2/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Discard framebuffer rendering queues when discarding layers Bug #55818...Mathias Agopian2011-11-145-2/+41
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Discard framebuffer rendering queues when discarding layersRomain Guy2011-11-105-2/+41
* | | | | Fix buildKristian Monsen2011-11-142-0/+3
* | | | | Merge "Removing the ability to get native instrumentation as part of nav dump"Kristian Monsen2011-11-142-22/+0
|\ \ \ \ \
| * | | | | Removing the ability to get native instrumentation as part of nav dumpKristian Monsen2011-11-112-22/+0
* | | | | | Merge "Added missing comments in Instrumentation#sendStringSync"Svetoslav Ganov2011-11-111-0/+5
|\ \ \ \ \ \
| * | | | | | Added missing comments in Instrumentation#sendStringSyncSvetoslav Ganov2011-11-111-0/+5
* | | | | | | Merge "Instrumentation sendStringSync(String) may try to inject obsolete even...Svetoslav Ganov2011-11-111-9/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Instrumentation sendStringSync(String) may try to inject obsolete events.Svetoslav Ganov2011-11-111-9/+8
* | | | | | | am 0fbd9eba: am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1Christopher Tate2011-11-111-3/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | XML parsing optimizationsChristopher Tate2011-11-111-3/+3
* | | | | | | Merge "Seems to break text views all over. Particularly noticeable is that t...Jeff Brown2011-11-111-7/+5
|\ \ \ \ \ \ \
| * | | | | | | Seems to break text views all over. Particularly noticeable is that the labe...Jeff Brown2011-11-111-7/+5
* | | | | | | | am 0b554bab: am d400d03f: Merge "Fix issue #5595933: GREF leak due to race co...Dianne Hackborn2011-11-111-0/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1Dianne Hackborn2011-11-111-0/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Fix issue #5595933: GREF leak due to race condition in...Dianne Hackborn2011-11-111-0/+7
* | | | | | | | | am 9acae658: am 847fbbea: Merge "Localized optimizations in views and bitmaps...Christopher Tate2011-11-112-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Localized optimizations in views and bitmaps" into ics-mr1Christopher Tate2011-11-112-6/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Localized optimizations in views and bitmapsChristopher Tate2011-11-112-6/+8
* | | | | | | | | | am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Changes for access control.Jeff Hamilton2011-11-114-32/+63
| | |/ / / / / / / /
* | | | | | | | | | am 5a8ad071: am a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile...Matthew Xie2011-11-114-25/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming...Matthew Xie2011-11-114-25/+47
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connectMatthew Xie2011-11-114-25/+47