summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in gingerbread-release history after reset to gingerbreadandroid-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1The Android Automerger2011-06-160-0/+0
|\
| * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-100-0/+0
| |\
| | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-090-0/+0
| | |\
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-060-0/+0
| | | |\
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-250-0/+0
| | | | |\
| | | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-130-0/+0
| | | | | |\
| | | | | | * Revert "CTS: Fixes a possible "out of memory" exception"android-2.3.4_r1Brian Muramatsu2011-04-221-15/+11
| | | | | | * Backport from HC to Fix NetworkInfoTestXia Wang2011-04-222-149/+65
| | | | | | * Enhance the options check so that if we expect to see a nullFred Quintana2011-04-221-1/+3
| | | | | | * keep previous historyandroid-2.3.4_r0.9android-merger2011-04-060-0/+0
| | | | | | |\
* | | | | | | \ Merge "Clarify vold isn't exploitable when no sd card exists" into gingerbreadBrian Muramatsu2011-06-161-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify vold isn't exploitable when no sd card existsNick Kralevich2011-06-161-2/+2
|/ / / / / / / /
* | | | | | | | Merge "Test for Checking Package Signatures" into gingerbreadBrian Muramatsu2011-06-165-0/+128
|\ \ \ \ \ \ \ \
| * | | | | | | | Test for Checking Package SignaturesBrian Muramatsu2011-06-155-0/+128
| |/ / / / / / /
* | | | | | | | Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbreadBrian Muramatsu2011-06-153-0/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Detect when BT Pairing Dialog is Incorrectly ShownBrian Muramatsu2011-06-093-0/+49
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Wait for completing the initialization of WebViewCore" into gingerbreadBrian Muramatsu2011-06-131-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Wait for completing the initialization of WebViewCoreMasanori Ogino2011-05-261-5/+12
* | | | | | | | | Merge "Add some strings for screen where the text stayed in" into gingerbreadBrian Muramatsu2011-06-131-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add some strings for screen where the text stayed inKaoriFujimoto2011-06-101-1/+3
* | | | | | | | | Merge "Remove testUnknownSourcesByDefaultTest" into gingerbreadBrian Muramatsu2011-06-101-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove testUnknownSourcesByDefaultTestBrian Muramatsu2011-06-101-5/+0
| |/ / / / / / / /
* | | | | | | | | Merge "Increment Version to 2.3_r4" into gingerbreadBrian Muramatsu2011-06-101-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Increment Version to 2.3_r4Brian Muramatsu2011-06-101-1/+1
|/ / / / / / / /
* | | | | | | | Merge "Fixes for the location manager cts tests" into gingerbreadBrian Muramatsu2011-06-091-3/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fixes for the location manager cts testsJason Bayer2011-06-091-3/+13
|/ / / / / / /
* | | | | | | Merge "location provider fixes: test the provider without assuming presence o...Brian Muramatsu2011-06-071-4/+30
|\ \ \ \ \ \ \
| * | | | | | | location provider fixes: test the provider without assuming presence of any p...Jason Bayer2011-06-071-4/+30
* | | | | | | | Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbreadBrian Muramatsu2011-06-064-7/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge remote branch 'korg/froyo' into manualmergeBrian Muramatsu2011-06-064-7/+58
|/| | | | | | |
| * | | | | | | Merge "Revert "Check "Unknown Sources" is Enabled by Default"" into froyoBrian Muramatsu2011-06-061-6/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Check "Unknown Sources" is Enabled by Default"Brian Muramatsu2011-06-061-6/+0
| |/ / / / / / /
| * | | | | | | Merge "Increment Version to 2.2_r6" into froyoBrian Muramatsu2011-06-031-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Increment Version to 2.2_r6Brian Muramatsu2011-06-031-1/+1
| * | | | | | | | Merge "Add more CTS tests." into froyoBrian Muramatsu2011-06-024-7/+58
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add more CTS tests.Marco Nelissen2011-06-024-7/+58
| |/ / / / / / /
| * | | | | | | Merge "Check "Unknown Sources" is Enabled by Default" into froyoBrian Muramatsu2011-05-241-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Check "Unknown Sources" is Enabled by DefaultBrian Muramatsu2011-05-241-0/+6
| |/ / / / / / /
| * | | | | | | Merge "Don't fail if vold.fstab is empty" into froyoBrian Muramatsu2011-05-231-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Don't fail if vold.fstab is emptyNick Kralevich2011-05-231-1/+5
| |/ / / / / / /
| * | | | | | | Merge "Don't fail on netlink socket closing." into froyoBrian Muramatsu2011-05-051-2/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Don't fail on netlink socket closing.Nick Kralevich2011-05-051-2/+11
| |/ / / / / / /
* | | | | | | | Merge "Make sensors optional" into gingerbreadBrian Muramatsu2011-06-061-6/+24
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Make sensors optionalDylan Reid2011-06-061-6/+24
|/ / / / / / /
* | | | | | | Merge "Copy Verifier Results to Clipboard" into gingerbreadBrian Muramatsu2011-06-034-3/+20
|\ \ \ \ \ \ \
| * | | | | | | Copy Verifier Results to ClipboardBrian Muramatsu2011-06-034-3/+20
|/ / / / / / /
* | | | | | | Merge "Audio Latency Tests" into gingerbreadBrian Muramatsu2011-06-039-14/+657
|\ \ \ \ \ \ \
| * | | | | | | Audio Latency TestsBrian Muramatsu2011-06-039-14/+657
|/ / / / / / /
* | | | | | | Merge "Skip Bluetooth tests if the device doesn't support Bluetooth." into gi...Brian Muramatsu2011-06-021-8/+43
|\ \ \ \ \ \ \
| * | | | | | | Skip Bluetooth tests if the device doesn't support Bluetooth.fujimoto.kaori2011-06-021-8/+43
| | |_|/ / / / | |/| | | | |