summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \...Conley Owens2011-04-291-3/+4
|\
| * am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in excep...Conley Owens2011-04-291-3/+4
| |\
| | * am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"Conley Owens2011-04-281-3/+4
| | |\
| | | * am 8fff7805: Merge "Remove duplicate \'=\' in exception message"Conley Owens2011-04-281-3/+4
| | | |\
| | | | * Merge "Remove duplicate '=' in exception message"Conley Owens2011-04-281-3/+4
| | | | |\
| | | | | * Remove duplicate '=' in exception messageBernhard Reutner-Fischer2011-04-281-3/+4
| | | | |/
* | | | | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/baseNick Kralevich2011-04-295-17/+21
|\ \ \ \ \
| * \ \ \ \ Merge "Touch exploration - nits"Svetoslav Ganov2011-04-295-17/+21
| |\ \ \ \ \
| | * | | | | Touch exploration - nitsSvetoslav Ganov2011-04-295-17/+21
* | | | | | | am 27ad0df0: am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers...Scott Main2011-04-291-2/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config q...Scott Main2011-04-291-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiersScott Main2011-04-291-2/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am c7eb47fa: docs: tweak table headers for config qualifiersScott Main2011-04-291-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: tweak table headers for config qualifiersScott Main2011-04-291-2/+2
* | | | | | | | | | am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate e...James Dong2011-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not...James Dong2011-04-292-0/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-292-0/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
* | | | | | | | | Merge "Pipe rsa function though the RS api table."Jason Sams2011-04-297-73/+157
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pipe rsa function though the RS api table.Jason Sams2011-04-287-73/+157
* | | | | | | | | | Merge "Fix fifo size check code."Jason Sams2011-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix fifo size check code.Jason Sams2011-04-291-1/+1
* | | | | | | | | | | Merge "SuggestionSpans are removed around edited text."Gilles Debunne2011-04-292-23/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SuggestionSpans are removed around edited text.Gilles Debunne2011-04-292-23/+39
* | | | | | | | | | | | am 67c92fbd: am 5f2ff42b: Add data to bugreports.Robert Greenwalt2011-04-291-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 5f2ff42b: Add data to bugreports.Robert Greenwalt2011-04-291-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Add data to bugreports.Robert Greenwalt2011-04-291-0/+3
* | | | | | | | | | | | Merge "TextView uses WordIterator to select words."Gilles Debunne2011-04-291-93/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | TextView uses WordIterator to select words.Gilles Debunne2011-04-281-93/+46
* | | | | | | | | | | | | Merge "Turn on SIP phone support by default."Hung-ying Tyan2011-04-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Turn on SIP phone support by default.Hung-ying Tyan2011-04-291-2/+2
* | | | | | | | | | | | | | Merge "get rid of dependency on copybit HAL module"Mathias Agopian2011-04-284-1793/+1650
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | get rid of dependency on copybit HAL moduleMathias Agopian2011-04-284-1793/+1650
* | | | | | | | | | | | | | | Merge "Fix the build."Romain Guy2011-04-281-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix the build.Romain Guy2011-04-281-3/+0
* | | | | | | | | | | | | | | | Introducing the split action bar.Adam Powell2011-04-2813-20/+114
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "This file should not be here."Romain Guy2011-04-281-245/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | This file should not be here.Romain Guy2011-04-281-245/+0
* | | | | | | | | | | | | | | | Merge "New widget: TextureView Bug #4343984"Romain Guy2011-04-2819-86/+847
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | New widget: TextureViewRomain Guy2011-04-2819-86/+847
* | | | | | | | | | | | | | | Merge "Use passive provider for location based country detection"Daisuke Miyakawa2011-04-284-68/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use passive provider for location based country detectionDaisuke Miyakawa2011-04-284-68/+161
* | | | | | | | | | | | | | | | Merge "TextView's baseline is correctly computed for empty text."Gilles Debunne2011-04-282-17/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | TextView's baseline is correctly computed for empty text.Gilles Debunne2011-04-282-17/+34
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "libgui: enable tests in the 'tests' build."Jamie Gennis2011-04-282-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | libgui: enable tests in the 'tests' build.Jamie Gennis2011-04-262-3/+4
* | | | | | | | | | | | | | | | | am c932a56a: am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misd...Scott Main2011-04-281-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link ...Scott Main2011-04-281-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Decl...Scott Main2011-04-281-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout ...Scott Main2011-04-281-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | |