summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MTP: work in progress on expanded property supportMike Lockwood2010-08-258-72/+225
* am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into googl...Jean-Baptiste Queru2010-08-250-0/+0
|\
| * am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variantJean-Baptiste Queru2010-08-250-0/+0
| |\
| | * am d5e601c2: reconcile open-source froyo into google variantJean-Baptiste Queru2010-08-250-0/+0
| | |\
| | | * reconcile open-source froyo into google variantJean-Baptiste Queru2010-08-250-0/+0
| | | |\
| | | | * Make the default backup configuration "disabled; local transport selected"Christopher Tate2010-08-251-1/+2
* | | | | am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbreadBrian Carlstrom2010-08-250-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 59073b15: Merge "Fix linux 64 build" into gingerbreadBrian Carlstrom2010-08-250-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix linux 64 build" into gingerbreadBrian Carlstrom2010-08-252-2/+2
| | |\ \ \
| | | * | | Fix linux 64 buildBrian Carlstrom2010-08-242-2/+2
* | | | | | Merge "Add --el option to am for long extras."Makoto Onuki2010-08-251-0/+6
|\ \ \ \ \ \
| * | | | | | Add --el option to am for long extras.Makoto Onuki2010-08-241-0/+6
* | | | | | | Merge "Fix the documentation of ContentValues."Jeff Hamilton2010-08-251-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix the documentation of ContentValues.Jeff Hamilton2010-08-251-0/+4
* | | | | | | | Merge "Change animator xml importing to use new inflater class"Chet Haase2010-08-256-246/+351
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Change animator xml importing to use new inflater classChet Haase2010-08-246-246/+351
* | | | | | | | Revert "Add support for generated documentation as part of the SDK docs."Mike Lockwood2010-08-251-3/+3
* | | | | | | | resolved conflicts for merge of 20afae51 to masterChih-Chung Chang2010-08-251-10/+20
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called...Chih-Chung Chang2010-08-251-10/+20
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "Avoid allocating buffer every time getThumbnail is called." into ginge...Chih-Chung Chang2010-08-251-10/+20
| | |\ \ \ \ \ \
| | | * | | | | | Avoid allocating buffer every time getThumbnail is called.Chih-Chung Chang2010-08-251-10/+20
* | | | | | | | | am 73497e92: am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and ...Hung-ying Tyan2010-08-251-1/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder c...Hung-ying Tyan2010-08-241-1/+40
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" i...Hung-ying Tyan2010-08-241-1/+40
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | SipProfile: add isOutgoingCallAllowed() and new builder constructorHung-ying Tyan2010-08-241-1/+40
* | | | | | | | | am 22518947: am bfc9325f: Merge "Add support for generated documentation as p...Rohit Mungee2010-08-241-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am bfc9325f: Merge "Add support for generated documentation as part of the SD...Rohit Mungee2010-08-241-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Add support for generated documentation as part of the SDK docs." into...Rohit Mungee2010-08-241-3/+3
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Add support for generated documentation as part of the SDK docs.Bill Napier2010-08-241-3/+3
| | | |/ / / / /
* | | | | | | | am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tes...Daisuke Miyakawa2010-08-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbreadDaisuke Miyakawa2010-08-245-107/+45
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix the test breakage in vCard tests." into gingerbreadDaisuke Miyakawa2010-08-245-107/+45
| | |\ \ \ \ \ \
| | | * | | | | | Fix the test breakage in vCard tests.Daisuke Miyakawa2010-08-245-107/+45
* | | | | | | | | am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configu...Christopher Tate2010-08-241-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disab...Christopher Tate2010-08-241-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 02e18d4d: Merge "Make the default backup configuration "disabled; local tr...Christopher Tate2010-08-241-1/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge "Make the default backup configuration "disabled; local transport selec...Christopher Tate2010-08-241-1/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Make the default backup configuration "disabled; local transport selected"Christopher Tate2010-08-241-1/+2
* | | | | | | | | | am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively sl...Brad Fitzpatrick2010-08-241-12/+170
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings ...Brad Fitzpatrick2010-08-241-12/+170
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Negatively cache settings and proactively slurp settings into cache." ...Brad Fitzpatrick2010-08-241-12/+170
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Negatively cache settings and proactively slurp settings into cache.Brad Fitzpatrick2010-08-241-12/+170
| | | | |_|/ / / / / | | | |/| | | | | |
* | | | | | | | | | Merge "Fix passion build"Romain Guy2010-08-241-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix passion buildRomain Guy2010-08-241-0/+2
* | | | | | | | | | | Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12"Joe Malin2010-08-241-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12Joe Malin2010-07-301-0/+0
* | | | | | | | | | | | am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the or...Mathias Agopian2010-08-2411-37/+212
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 8395b462: Merge "fix [2931513] Add support for setting the orientation of ...Mathias Agopian2010-08-2411-37/+212
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "fix [2931513] Add support for setting the orientation of an ANativeWin...Mathias Agopian2010-08-2411-37/+212
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | fix [2931513] Add support for setting the orientation of an ANativeWindowMathias Agopian2010-08-2411-37/+212