summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove some spurious debuging LOGDMathias Agopian2009-06-031-1/+1
* fix/clean these Android.mk following dbort and joeo's commentsMathias Agopian2009-06-033-12/+11
* when looking for an EGLConfig always pick the first one that matches, not the...Mathias Agopian2009-06-031-0/+1
* Merge commit 'goog/master' into merge_masterMathias Agopian2009-06-0114-662/+11
|\
| * am b249890b: Merge change 2835 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\
| | * Merge change 2835 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\
| * | | move utils/Pipe.h to the simulatorMathias Agopian2009-06-011-108/+0
| * | | am 892771ab: Rename WRITE_SDCARD to WRITE_EXTERNAL_STORAGE in browser test appGuang Zhu2009-06-010-0/+0
| |\ \ \ | | |/ /
| * | | Merge change 2836Android (Google) Code Review2009-06-013-204/+0
| |\ \ \
| | * | | get rid of TimerProbe which is never usedMathias Agopian2009-06-013-204/+0
| * | | | am ff0d9147: Merge change 2766 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge change 2766 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\ \ \
| * | \ \ \ am 40d87ee4: Removing @Override to fix the buildGuang Zhu2009-06-010-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| * | | | am 50566b35: Merge change 2816 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge change 2816 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\ \ \
| * | \ \ \ am fa30c0ee: Merge change 2548 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge change 2548 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | am 162c9d0e: Merge change 2805 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge change 2805 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\ \ \ \
| * | \ \ \ \ am 450ad31b: Merge change 2774 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge change 2774 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\ \ \ \ \
| * | \ \ \ \ \ am 10d273bb: Merge change 2591 into donutAndroid (Google) Code Review2009-06-010-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge change 2591 into donutAndroid (Google) Code Review2009-06-010-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | get rid of sleepForInterval() which didn't seem to be used anywhere in the so...Mathias Agopian2009-05-315-285/+0
| * | | | | | | Merge change 2792Android (Google) Code Review2009-05-315-37/+11
| |\ \ \ \ \ \ \
| | * | | | | | | get rid of utils.hMathias Agopian2009-05-315-37/+11
| * | | | | | | | am 181fafaf: Retool the backup process to use a new \'BackupAgent\' classChristopher Tate2009-05-310-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | am c01159bb: am 7363e049: AI 149404: Am sending again with the latest changes...Doug Kramer2009-05-310-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | |
| | * | | | | | am 7363e049: AI 149404: Am sending again with the latest changes Publish Ac...Doug Kramer2009-05-300-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | get rid of utils/executablepath.h, which now lives in the simulatorMathias Agopian2009-05-311-28/+0
* | | | | | | | merge master to master_glMathias Agopian2009-05-316-545/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 11b1675a: Merge change 2626 into donutAndroid (Google) Code Review2009-05-291-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge change 2626 into donutAndroid (Google) Code Review2009-05-291-1/+2
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Adding TTS error code to signal missing resources (for instance missing langu...Jean-Michel Trivi2009-05-281-1/+2
| | | | |_|/ / | | | |/| | |
| * | | | | | am 6190fe6e: Merge change 2758 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge change 2758 into donutAndroid (Google) Code Review2009-05-290-0/+0
| | |\ \ \ \ \
| * | \ \ \ \ \ am afbc9ab3: Merge change 2692 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge change 2692 into donutAndroid (Google) Code Review2009-05-290-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | am c3b7e4e7: Merge change 2736 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge change 2736 into donutAndroid (Google) Code Review2009-05-290-0/+0
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ am f422dc49: Merge change 2566 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge change 2566 into donutAndroid (Google) Code Review2009-05-290-0/+0
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ am 2d75410f: Merge change 2748 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge change 2748 into donutAndroid (Google) Code Review2009-05-290-0/+0
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ am b61ae351: Merge change 2747 into donutAndroid (Google) Code Review2009-05-291-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 2747 into donutAndroid (Google) Code Review2009-05-291-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | log the geomerty of surfaces causing an out of memory in SurfaceFlinger.Mathias Agopian2009-05-291-1/+3
| * | | | | | | | | | am a5f50b8f: Merge change 2746 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 2746 into donutAndroid (Google) Code Review2009-05-290-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am 0f5179c7: Merge change 2716 into donutAndroid (Google) Code Review2009-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /