Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 639d69fe: Merge change I88d11cfb into eclair | Mathias Agopian | 2009-10-19 | 1 | -41/+44 |
|\ | |||||
| * | Merge change I88d11cfb into eclair | Android (Google) Code Review | 2009-10-19 | 1 | -41/+44 |
| |\ | |||||
| | * | one step towards fixing [2071412] work around mdp 32-bits fade limitation | Mathias Agopian | 2009-10-16 | 1 | -41/+44 |
* | | | Merge change I3834b1cb into eclair-mr2 | Android (Google) Code Review | 2009-10-19 | 0 | -0/+0 |
|\ \ \ | |||||
* \ \ \ | Merge change I4458a55d into eclair-mr2 | Android (Google) Code Review | 2009-10-19 | 0 | -0/+0 |
|\ \ \ \ | |||||
* \ \ \ \ | Merge change Ia245b1c4 into eclair-mr2 | Android (Google) Code Review | 2009-10-19 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
* \ \ \ \ \ | Merge change Ib1678609 into eclair-mr2 | Android (Google) Code Review | 2009-10-19 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
* | | | | | | am 007a429f: Update 5.xml with last minute changes. | Dianne Hackborn | 2009-10-19 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
* | | | | | Merge change I63d524fd into eclair-mr2 | Android (Google) Code Review | 2009-10-19 | 0 | -0/+0 |
| |/ / / |/| | | | |||||
* | | | | Merge change I44bbc36d into eclair-mr2 | Android (Google) Code Review | 2009-10-17 | 0 | -0/+0 |
|\ \ \ \ | |||||
* \ \ \ \ | am 445c05c4: am f3bc5349: docs: fix doc error in dialog example snippet (no n... | Scott Main | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am f3bc5349: docs: fix doc error in dialog example snippet (no not merge) | Scott Main | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ | |||||
* | \ \ \ \ | resolved conflicts for merge of f585be7f to eclair-mr2 | Andreas Huber | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge change I11ebbfd9 into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | am da2ecbeb: Merge change Idcaa1ef8 into eclair | Yu Shan Emily Lau | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge change Idcaa1ef8 into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | am d8f7a0e3: Merge change I7299c83b into eclair | Jason Sams | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge change I7299c83b into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | am 69fba87a: Merge change I6fc56997 into eclair | Mathias Agopian | 2009-10-16 | 13 | -565/+523 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge change I6fc56997 into eclair | Android (Google) Code Review | 2009-10-16 | 13 | -565/+523 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fix [2187212] add support for GLESv2 dispatch based on TLS | Mathias Agopian | 2009-10-14 | 13 | -565/+523 |
* | | | | | | | | | am 7bb7e992: Merge change Ia8ac904d into eclair | Mathias Agopian | 2009-10-16 | 2 | -6/+16 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge change Ia8ac904d into eclair | Android (Google) Code Review | 2009-10-16 | 2 | -6/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | fix [2182249] [MR1] valgrind error in surface flinger | Mathias Agopian | 2009-10-15 | 2 | -6/+16 |
* | | | | | | | | | | am 7f66dbce: Merge change Ic37381fb into eclair | Scott Main | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge change Ic37381fb into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge change I8176f35e into eclair-mr2 | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ | am c75348a9: (-s ours) Merge change Ib897cff1 into eclair | Suchi Amalapurapu | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Merge change Ib897cff1 into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | Merge change Ief544bc6 into eclair-mr2 | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ | am 0b08abe1: Merge change I9521cf8b into eclair | Mike Lockwood | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge change I9521cf8b into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
* | | | | | | | | | am f55aa972: Merge change I01935be3 into eclair | Mike Lockwood | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge change I01935be3 into eclair | Android (Google) Code Review | 2009-10-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
* | | | | | | | | am 39e67734: (-s ours) do not merge: fix copy/paste using trackball on passion | Cary Clark | 2009-10-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
* | | | | | | | | am b9a22122: Merge change I0e09e56f into eclair | Dave Sparks | 2009-10-15 | 2 | -30/+63 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge change I0e09e56f into eclair | Android (Google) Code Review | 2009-10-16 | 2 | -30/+63 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Don't callback on NULL client. Bug 2180510. | Dave Sparks | 2009-10-15 | 2 | -30/+63 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
* | | | | | | | | am 034cd0be: Merge change I486fdb55 into eclair | Joe Onorato | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge change I486fdb55 into eclair | Android (Google) Code Review | 2009-10-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | am 4f1d7656: Merge change I741a6100 into eclair | Jason Sams | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge change I741a6100 into eclair | Android (Google) Code Review | 2009-10-15 | 0 | -0/+0 |
| |/ / / / / / | |||||
* | | | | | | | am 37a13208: Add separate configuration flag for hardware ALS support. | Mike Lockwood | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
* | | | | | | | am 41c19db9: Remove hack in RS that called exit to WAR now fixed driver bugs.... | Jason Sams | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
* | | | | | | | am c7412b3b: Minor bug fixes and add glError check. | Jason Sams | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
* | | | | | | | am 6a17e163: Add egl init start message to help debug driver init hangs. | Jason Sams | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
* | | | | | | | am 2a39758e: Merge change I51d41230 into eclair | jsh | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge change I51d41230 into eclair | Android (Google) Code Review | 2009-10-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
* | | | | | | | am 173a25f6: Merge change I0d74deb6 into eclair | Romain Guy | 2009-10-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Merge change I0d74deb6 into eclair | Android (Google) Code Review | 2009-10-15 | 0 | -0/+0 |
| | |/ / / | |/| | | |