Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement remaining infrastructure for user disabling apps. | Dianne Hackborn | 2011-06-17 | 7 | -2/+55 |
* | am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian transla... | Maarten Hooft | 2011-06-16 | 1 | -0/+2 |
|\ | |||||
| * | am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into ... | Maarten Hooft | 2011-06-16 | 1 | -0/+2 |
| |\ | |||||
| | * | am d76baeb4: Merge "Import revised Croatian translations." into gingerbread | Maarten Hooft | 2011-06-16 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Merge "Import revised Croatian translations." into gingerbread | Maarten Hooft | 2011-06-16 | 1 | -0/+2 |
| | | |\ | |||||
| | | | * | Import revised Croatian translations. | Eric Fischer | 2011-06-15 | 1 | -0/+2 |
* | | | | | Merge "resolved conflicts for merge of 872a1e79 to master" | Dianne Hackborn | 2011-06-16 | 7 | -6/+72 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | resolved conflicts for merge of 872a1e79 to master | Dianne Hackborn | 2011-06-16 | 7 | -6/+72 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating al... | Dianne Hackborn | 2011-06-16 | 7 | -6/+72 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | am 2f04883f: SDK only: integrate new sample code, deprecating along the way. | Dianne Hackborn | 2011-06-16 | 7 | -6/+72 |
| | | |\ \ \ \ | |||||
| | | | * | | | | SDK only: integrate new sample code, deprecating along the way. | Dianne Hackborn | 2011-06-16 | 7 | -6/+72 |
* | | | | | | | | Merge "Update BiDiTest app for testing View padding" | Fabrice Di Meglio | 2011-06-16 | 3 | -0/+175 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update BiDiTest app for testing View padding | Fabrice Di Meglio | 2011-06-16 | 3 | -0/+175 |
* | | | | | | | | | Merge "Accessiiblity in right state upon connection of a test agent." | Svetoslav Ganov | 2011-06-16 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Accessiiblity in right state upon connection of a test agent. | Svetoslav Ganov | 2011-06-16 | 1 | -0/+8 |
* | | | | | | | | | | Merge "Prevent TweetDeck from crashing." | Romain Guy | 2011-06-16 | 1 | -9/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Prevent TweetDeck from crashing. | Romain Guy | 2011-06-16 | 1 | -9/+12 |
* | | | | | | | | | | | Merge "Adds more docs to classes in CalendarContract" | RoboErik | 2011-06-16 | 1 | -8/+50 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Adds more docs to classes in CalendarContract | RoboErik | 2011-06-16 | 1 | -8/+50 |
* | | | | | | | | | | | Merge "Adding ability to read back fbo data to renderscript" | Alex Sakhartchouk | 2011-06-16 | 16 | -116/+1025 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Adding ability to read back fbo data to renderscript | Alex Sakhartchouk | 2011-06-16 | 16 | -116/+1025 |
* | | | | | | | | | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump ba... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | New orientation handling. Only impacts SDK (aapt dump badging). | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
* | | | | | | | | | | | | | am 9bf1a0c3: (-s ours) am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into ho... | Robert Greenwalt | 2011-06-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | / / / / | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 | Robert Greenwalt | 2011-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 | Robert Greenwalt | 2011-06-16 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "DO NOT MERGE" into honeycomb-mr2 | Robert Greenwalt | 2011-06-16 | 1 | -7/+9 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | DO NOT MERGE | Robert Greenwalt | 2011-06-16 | 1 | -7/+9 |
| | | | |/ / / / / / / / | |||||
* | | | | | | | | | | | | Merge "Update getLayoutDirectionFromLocale() for using ICU" | Fabrice Di Meglio | 2011-06-16 | 2 | -14/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update getLayoutDirectionFromLocale() for using ICU | Fabrice Di Meglio | 2011-06-16 | 2 | -14/+3 |
* | | | | | | | | | | | | | Merge "Fix crash in ViewPropertyAnimator for unparented view." | Chet Haase | 2011-06-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix crash in ViewPropertyAnimator for unparented view. | Chet Haase | 2011-06-16 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base | Xavier Ducrohet | 2011-06-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add permission to fix NetworkPolicy tests. | Jeff Sharkey | 2011-06-16 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ... | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am 04ce8111: Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge "Add DroidDocs to Events class" | RoboErik | 2011-06-16 | 1 | -1/+97 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add DroidDocs to Events class | RoboErik | 2011-06-16 | 1 | -1/+97 |
* | | | | | | | | | | | | | Merge "DownloadManager flags for network policy." | Jeff Sharkey | 2011-06-16 | 6 | -5/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | DownloadManager flags for network policy. | Jeff Sharkey | 2011-06-16 | 6 | -5/+55 |
* | | | | | | | | | | | | | Merge "Inline SeekBarPreference" | John Reck | 2011-06-16 | 6 | -46/+404 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Inline SeekBarPreference | John Reck | 2011-06-16 | 6 | -46/+404 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the net... | Robert Greenwalt | 2011-06-16 | 3 | -52/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | am 5f350512: Merge "Reset connections AFTER we take down the network." into h... | Robert Greenwalt | 2011-06-16 | 3 | -52/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge "Reset connections AFTER we take down the network." into honeycomb-LTE | Robert Greenwalt | 2011-06-16 | 3 | -52/+40 |
| | |\ \ \ \ \ \ \ \ \ \ \ |