summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-222-37/+44
|\
| * Split libmedia into libmedia and libmedia_nativeGlenn Kasten2012-03-212-37/+44
* | Remove superfluous @hide annotations from WebSettingsClassicSteve Block2012-03-221-34/+1
* | Merge "Avoid calling into JNI if not needed."Jeff Brown2012-03-211-5/+15
|\ \
| * | Avoid calling into JNI if not needed.Jeff Brown2012-03-211-5/+15
* | | Fix typo... and buildJean-Baptiste Queru2012-03-211-2/+2
* | | Merge "Throw if WAL enabled/disabled when connections are in use."Jeff Brown2012-03-213-13/+95
|\ \ \ | |/ /
| * | Throw if WAL enabled/disabled when connections are in use.Jeff Brown2012-03-213-13/+95
* | | Add SeekBar property accessors to match available style attributesAdam Powell2012-03-212-0/+11
* | | Merge "GridView attribute updates"Adam Powell2012-03-212-1/+105
|\ \ \
| * | | GridView attribute updatesAdam Powell2012-03-212-1/+105
* | | | am 34da2ffe: am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Rel...Joe Fernandez2012-03-210-0/+0
|\ \ \ \
| * \ \ \ am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (f...Joe Fernandez2012-03-210-0/+0
| |\ \ \ \
| | * \ \ \ am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build ...Joe Fernandez2012-03-212-2/+5
| | |\ \ \ \
* | | \ \ \ \ am 5a8fb372: am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Rel...Joe Fernandez2012-03-212-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (f...Joe Fernandez2012-03-212-2/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build ...Joe Fernandez2012-03-212-2/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)...Joe Fernandez2012-03-212-2/+5
| | | |\ \ \ \ \
| | | | * | | | | docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)Joe Fernandez2012-03-212-2/+5
* | | | | | | | | Merge "Changing rsg to rs where functions don't rely on graphics."Alex Sakhartchouk2012-03-214-267/+122
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Changing rsg to rs where functions don't rely on graphics.Alex Sakhartchouk2012-03-214-267/+122
* | | | | | | | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-212-0/+63
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add MetaData::dumpToLogMarco Nelissen2012-03-212-0/+63
* | | | | | | | | Merge "Fix LayerDrawable#mutate"Adam Powell2012-03-211-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix LayerDrawable#mutateAdam Powell2012-03-211-1/+6
* | | | | | | | | | Merge "Fix location of selection handles on rotated text."George Mount2012-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix location of selection handles on rotated text.George Mount2012-03-211-1/+1
* | | | | | | | | | | Merge "Breaking up rs headers by logical components."Alex Sakhartchouk2012-03-216-123/+480
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Breaking up rs headers by logical components.Alex Sakhartchouk2012-03-216-123/+480
* | | | | | | | | | Restore deleted string still referenced from public.xml.Eric Fischer2012-03-211-0/+2
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-211-1/+1
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-2149-62/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-2149-62/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Continue animations started from AppWindowToken."Craig Mautner2012-03-212-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Continue animations started from AppWindowToken.Craig Mautner2012-03-212-3/+6
* | | | | | | | | | | | Merge "Plug memory leak. Bug #6196903"Romain Guy2012-03-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Plug memory leak.Romain Guy2012-03-211-0/+2
* | | | | | | | | | | | | Merge "Fix Animation bugs from DisplayList properties integration"Chet Haase2012-03-211-12/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Animation bugs from DisplayList properties integrationChet Haase2012-03-211-12/+8
* | | | | | | | | | | | | | Merge "Telephony: Remove coupling between phone and IccRecords"Wink Saville2012-03-2115-252/+368
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Telephony: Remove coupling between phone and IccRecordsAlex Yakavenka2012-03-2115-252/+368
* | | | | | | | | | | | | | | Merge "Override not drawing to screen when screen is off."Craig Mautner2012-03-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | / / / / / / / / | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Override not drawing to screen when screen is off.Craig Mautner2012-03-211-1/+3
* | | | | | | | | | | | | | Fix merge errorGeorge Mount2012-03-211-1/+1
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Make paste window and caret handle show up at the right time."George Mount2012-03-212-14/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make paste window and caret handle show up at the right time.George Mount2012-03-202-14/+36
* | | | | | | | | | | | | | Merge "Parse gapless info from mp4 files"Marco Nelissen2012-03-212-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Parse gapless info from mp4 filesMarco Nelissen2012-03-212-0/+49
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Minor refactoring prior to major refactoring."Craig Mautner2012-03-215-157/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \