summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge "Add textZoom setting"John Reck2011-06-171-8/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add textZoom settingJohn Reck2011-06-171-8/+41
* | | | | | | | | | | | | | | | | | Merge "SurfaceTexture: enable a test that now passes."Jamie Gennis2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | SurfaceTexture: enable a test that now passes.Jamie Gennis2011-06-151-1/+1
* | | | | | | | | | | | | | | | | | | Merge "SurfaceTexture: enable a test that is now passing."Jamie Gennis2011-06-171-14/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | SurfaceTexture: enable a test that is now passing.Jamie Gennis2011-06-151-14/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Fix IP address cleanup on network disconnect"Irfan Sheriff2011-06-173-9/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix IP address cleanup on network disconnectIrfan Sheriff2011-06-173-9/+27
* | | | | | | | | | | | | | | | | | Merge "Make the Notify Builder test usable on phones."Daniel Sandler2011-06-1717-219/+279
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Make the Notify Builder test usable on phones.Daniel Sandler2011-06-1617-219/+279
* | | | | | | | | | | | | | | | | | Merge "Mention device policay manager in Camera.open javadoc."Wu-cheng Li2011-06-171-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Mention device policay manager in Camera.open javadoc.Wu-cheng Li2011-06-171-1/+3
* | | | | | | | | | | | | | | | | | | Merge "Fix network state handling"Irfan Sheriff2011-06-161-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix network state handlingIrfan Sheriff2011-06-161-2/+6
* | | | | | | | | | | | | | | | | | | Merge "VPN: make the file descriptor non-blocking by default."Chia-chi Yeh2011-06-161-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | VPN: make the file descriptor non-blocking by default.Chia-chi Yeh2011-06-161-0/+8
* | | | | | | | | | | | | | | | | | | Merge "Update GridLayout constructors to properly handle DEBUG=true"Jim Miller2011-06-161-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update GridLayout constructors to properly handle DEBUG=trueJim Miller2011-06-161-6/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Dialog-o-rama!"Adam Powell2011-06-1632-74/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Dialog-o-rama!Adam Powell2011-06-1632-74/+80
* | | | | | | | | | | | | | | | | | | | am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fix...Mathias Agopian2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to ...Mathias Agopian2011-06-167-68/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2...Mathias Agopian2011-06-167-68/+111
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)Mathias Agopian2011-06-167-68/+111
* | | | | | | | | | | | | | | | | | | | | | | am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge....John Wang2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non...John Wang2011-06-161-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device...John Wang2011-06-161-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Merge "Revert "Do not merge. Return null id for Non-phone device."" into hone...John Wang2011-06-161-4/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | Revert "Do not merge. Return null id for Non-phone device."John Wang2011-06-161-4/+0
* | | | | | | | | | | | | | | | | | | | | | | am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian transla...Maarten Hooft2011-06-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into ...Maarten Hooft2011-06-161-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d76baeb4: Merge "Import revised Croatian translations." into gingerbreadMaarten Hooft2011-06-161-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import revised Croatian translations." into gingerbreadMaarten Hooft2011-06-161-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Import revised Croatian translations.Eric Fischer2011-06-151-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 872a1e79 to master"Dianne Hackborn2011-06-167-6/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 872a1e79 to masterDianne Hackborn2011-06-167-6/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating al...Dianne Hackborn2011-06-167-6/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | am 2f04883f: SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-167-6/+72
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-167-6/+72
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update BiDiTest app for testing View padding"Fabrice Di Meglio2011-06-163-0/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Update BiDiTest app for testing View paddingFabrice Di Meglio2011-06-163-0/+175
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Accessiiblity in right state upon connection of a test agent."Svetoslav Ganov2011-06-161-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Accessiiblity in right state upon connection of a test agent.Svetoslav Ganov2011-06-161-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent TweetDeck from crashing."Romain Guy2011-06-161-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Prevent TweetDeck from crashing.Romain Guy2011-06-161-9/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Adds more docs to classes in CalendarContract"RoboErik2011-06-161-8/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Adds more docs to classes in CalendarContractRoboErik2011-06-161-8/+50
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Adding ability to read back fbo data to renderscript"Alex Sakhartchouk2011-06-1616-116/+1025
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Adding ability to read back fbo data to renderscriptAlex Sakhartchouk2011-06-1616-116/+1025
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only...Dianne Hackborn2011-06-161-8/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |