summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge "Perform early intersect to avoid unnecessary draws"Romain Guy2012-02-233-48/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Perform early intersect to avoid unnecessary drawsRomain Guy2012-02-233-48/+39
* | | | | | | | | | | | | | | | Merge "Support mIntentUrl for addresses"John Reck2012-02-232-19/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Support mIntentUrl for addressesJohn Reck2012-02-232-19/+39
* | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-02-235-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-235-9/+9
* | | | | | | | | | | | | | | | am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656...Jean-Baptiste Queru2012-02-231-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml...Jean-Baptiste Queru2012-02-231-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes i...Jean-Baptiste Queru2012-02-231-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Lib...Jean-Baptiste Queru2012-02-231-3/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"Jean-Baptiste Queru2012-02-231-3/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Fix for issue 9656 - custom xml attributes in Android Librariesinazaruk2011-05-281-3/+9
* | | | | | | | | | | | | | | | | | am 08cb8352: am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to g...Michael Jurka2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bou...Michael Jurka2012-02-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screenMichael Jurka2012-02-231-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 6ad5d69d: am 0a232673: am bf378fd7: Don\'t allow screen invalidations to g...Michael Jurka2012-02-231-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bou...Michael Jurka2012-02-231-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screenMichael Jurka2012-02-231-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Don't allow screen invalidations to go outside bounds of screenMichael Jurka2012-02-231-0/+2
* | | | | | | | | | | | | | | | | | am 8857f669: am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics...Scott Main2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1Scott Main2012-02-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 68d97aa2: Merge "docs: fix broken link" into ics-mr1Scott Main2012-02-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am cb4ebcb2: am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics...Scott Main2012-02-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1Scott Main2012-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 68d97aa2: Merge "docs: fix broken link" into ics-mr1Scott Main2012-02-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "docs: fix broken link" into ics-mr1Scott Main2012-02-221-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | docs: fix broken linkScott Main2012-02-171-1/+1
* | | | | | | | | | | | | | | | | | | am 3c84c30a: am 1f46d79f: am 503247f2: Merge "Make sure resource references a...Xavier Ducrohet2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved."...Xavier Ducrohet2012-02-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-19/+176
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 9379ac38: (-s ours) am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stub...Jean-Baptiste Queru2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatib...Jean-Baptiste Queru2012-02-226-0/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"Jean-Baptiste Queru2012-02-226-0/+107
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | am 69e9c30c: Merge "Add stubs for improved compatibility"Jean-Baptiste Queru2012-02-226-0/+107
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Add stubs for improved compatibility"Jean-Baptiste Queru2012-02-226-0/+107
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Add stubs for improved compatibilityJean-Baptiste Queru2012-02-216-0/+107
* | | | | | | | | | | | | | | | | | | | am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references a...Xavier Ducrohet2012-02-232-19/+176
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved."...Xavier Ducrohet2012-02-222-19/+176
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-19/+176
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-19/+176
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Make sure resource references are resolved.Xavier Ducrohet2012-02-212-19/+176
* | | | | | | | | | | | | | | | | | | | am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-02-231-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-02-221-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-02-221-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-02-221-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Xcode 4.3 compatibility checkinAl Sutton2012-02-191-3/+3
* | | | | | | | | | | | | | | | | | | | | am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop...Jean-Baptiste Queru2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"Jean-Baptiste Queru2012-02-221-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 4280891d: Merge "The bigger touch slop still has a problem"Jean-Baptiste Queru2012-02-221-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Merge "The bigger touch slop still has a problem"Jean-Baptiste Queru2012-02-221-2/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |