| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Fix IP address cleanup on network disconnect" | Irfan Sheriff | 2011-06-17 | 3 | -9/+27 |
| |\ | |||||
| | * | Fix IP address cleanup on network disconnect | Irfan Sheriff | 2011-06-17 | 3 | -9/+27 |
| * | | Merge "Make the Notify Builder test usable on phones." | Daniel Sandler | 2011-06-17 | 17 | -219/+279 |
| |\ \ | |||||
| | * | | Make the Notify Builder test usable on phones. | Daniel Sandler | 2011-06-16 | 17 | -219/+279 |
| * | | | Merge "Mention device policay manager in Camera.open javadoc." | Wu-cheng Li | 2011-06-17 | 1 | -1/+3 |
| |\ \ \ | |||||
| | * | | | Mention device policay manager in Camera.open javadoc. | Wu-cheng Li | 2011-06-17 | 1 | -1/+3 |
| * | | | | Merge "Fix network state handling" | Irfan Sheriff | 2011-06-16 | 1 | -2/+6 |
| |\ \ \ \ | |||||
| | * | | | | Fix network state handling | Irfan Sheriff | 2011-06-16 | 1 | -2/+6 |
| * | | | | | Merge "VPN: make the file descriptor non-blocking by default." | Chia-chi Yeh | 2011-06-16 | 1 | -0/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | VPN: make the file descriptor non-blocking by default. | Chia-chi Yeh | 2011-06-16 | 1 | -0/+8 |
| * | | | | | | Merge "Update GridLayout constructors to properly handle DEBUG=true" | Jim Miller | 2011-06-16 | 1 | -7/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Update GridLayout constructors to properly handle DEBUG=true | Jim Miller | 2011-06-16 | 1 | -6/+5 |
| * | | | | | | | Merge "Dialog-o-rama!" | Adam Powell | 2011-06-16 | 32 | -74/+80 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Dialog-o-rama! | Adam Powell | 2011-06-16 | 32 | -74/+80 |
| * | | | | | | | | am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fix... | Mathias Agopian | 2011-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to ... | Mathias Agopian | 2011-06-16 | 7 | -68/+111 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2... | Mathias Agopian | 2011-06-16 | 7 | -68/+111 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) | Mathias Agopian | 2011-06-16 | 7 | -68/+111 |
| * | | | | | | | | | | | am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge.... | John Wang | 2011-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non... | John Wang | 2011-06-16 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device... | John Wang | 2011-06-16 | 1 | -4/+0 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge "Revert "Do not merge. Return null id for Non-phone device."" into hone... | John Wang | 2011-06-16 | 1 | -4/+0 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Revert "Do not merge. Return null id for Non-phone device." | John Wang | 2011-06-16 | 1 | -4/+0 |
| * | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |