summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 639d69fe: Merge change I88d11cfb into eclairMathias Agopian2009-10-191-41/+44
|\
| * Merge change I88d11cfb into eclairAndroid (Google) Code Review2009-10-191-41/+44
| |\
| | * one step towards fixing [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-161-41/+44
* | | Merge change I3834b1cb into eclair-mr2Android (Google) Code Review2009-10-190-0/+0
|\ \ \
* \ \ \ Merge change I4458a55d into eclair-mr2Android (Google) Code Review2009-10-190-0/+0
|\ \ \ \
* \ \ \ \ Merge change Ia245b1c4 into eclair-mr2Android (Google) Code Review2009-10-190-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge change Ib1678609 into eclair-mr2Android (Google) Code Review2009-10-190-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 007a429f: Update 5.xml with last minute changes.Dianne Hackborn2009-10-190-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
* | | | | Merge change I63d524fd into eclair-mr2Android (Google) Code Review2009-10-190-0/+0
| |/ / / |/| | |
* | | | Merge change I44bbc36d into eclair-mr2Android (Google) Code Review2009-10-170-0/+0
|\ \ \ \
* \ \ \ \ am 445c05c4: am f3bc5349: docs: fix doc error in dialog example snippet (no n...Scott Main2009-10-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am f3bc5349: docs: fix doc error in dialog example snippet (no not merge)Scott Main2009-10-160-0/+0
| |\ \ \ \
* | \ \ \ \ resolved conflicts for merge of f585be7f to eclair-mr2Andreas Huber2009-10-160-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change I11ebbfd9 into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am da2ecbeb: Merge change Idcaa1ef8 into eclairYu Shan Emily Lau2009-10-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge change Idcaa1ef8 into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am d8f7a0e3: Merge change I7299c83b into eclairJason Sams2009-10-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change I7299c83b into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am 69fba87a: Merge change I6fc56997 into eclairMathias Agopian2009-10-1613-565/+523
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change I6fc56997 into eclairAndroid (Google) Code Review2009-10-1613-565/+523
| |\ \ \ \ \ \ \
| | * | | | | | | fix [2187212] add support for GLESv2 dispatch based on TLSMathias Agopian2009-10-1413-565/+523
* | | | | | | | | am 7bb7e992: Merge change Ia8ac904d into eclairMathias Agopian2009-10-162-6/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge change Ia8ac904d into eclairAndroid (Google) Code Review2009-10-162-6/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix [2182249] [MR1] valgrind error in surface flingerMathias Agopian2009-10-152-6/+16
* | | | | | | | | | am 7f66dbce: Merge change Ic37381fb into eclairScott Main2009-10-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge change Ic37381fb into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge change I8176f35e into eclair-mr2Android (Google) Code Review2009-10-160-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ am c75348a9: (-s ours) Merge change Ib897cff1 into eclairSuchi Amalapurapu2009-10-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge change Ib897cff1 into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge change Ief544bc6 into eclair-mr2Android (Google) Code Review2009-10-160-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ am 0b08abe1: Merge change I9521cf8b into eclairMike Lockwood2009-10-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge change I9521cf8b into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am f55aa972: Merge change I01935be3 into eclairMike Lockwood2009-10-160-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge change I01935be3 into eclairAndroid (Google) Code Review2009-10-160-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | am 39e67734: (-s ours) do not merge: fix copy/paste using trackball on passionCary Clark2009-10-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
* | | | | | | | am b9a22122: Merge change I0e09e56f into eclairDave Sparks2009-10-152-30/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change I0e09e56f into eclairAndroid (Google) Code Review2009-10-162-30/+63
| |\ \ \ \ \ \ \
| | * | | | | | | Don't callback on NULL client. Bug 2180510.Dave Sparks2009-10-152-30/+63
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am 034cd0be: Merge change I486fdb55 into eclairJoe Onorato2009-10-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change I486fdb55 into eclairAndroid (Google) Code Review2009-10-150-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | am 4f1d7656: Merge change I741a6100 into eclairJason Sams2009-10-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change I741a6100 into eclairAndroid (Google) Code Review2009-10-150-0/+0
| |/ / / / / /
* | | | | | | am 37a13208: Add separate configuration flag for hardware ALS support.Mike Lockwood2009-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am 41c19db9: Remove hack in RS that called exit to WAR now fixed driver bugs....Jason Sams2009-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am c7412b3b: Minor bug fixes and add glError check.Jason Sams2009-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am 6a17e163: Add egl init start message to help debug driver init hangs.Jason Sams2009-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am 2a39758e: Merge change I51d41230 into eclairjsh2009-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge change I51d41230 into eclairAndroid (Google) Code Review2009-10-150-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | am 173a25f6: Merge change I0d74deb6 into eclairRomain Guy2009-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge change I0d74deb6 into eclairAndroid (Google) Code Review2009-10-150-0/+0
| | |/ / / | |/| | |