Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge change 21207 into eclair | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ | |||||
* | | ui: make native_window_set_usage be a static inline | Dima Zavin | 2009-08-13 | 1 | -1/+1 |
|/ | |||||
* | Merge change 21171 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ | |||||
* \ | Merge change 21166 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ | |||||
* \ \ | Merge change 21186 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ | |||||
* \ \ \ | Merge change 21162 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ | |||||
* \ \ \ \ | Merge change 21185 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
* | | | | | Merge change 21159 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
* \ \ \ \ \ | Merge change 21152 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
* \ \ \ \ \ \ | Merge change 21134 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ | Merge change 20853 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge change 21158 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge change 21153 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
* | | | | | | Modified the camera HAL interface to use the same generic callback architectu... | Benny Wong | 2009-08-13 | 6 | -365/+374 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge change 21090 | Android (Google) Code Review | 2009-08-13 | 0 | -0/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge change 21106 | Android (Google) Code Review | 2009-08-13 | 2 | -3/+18 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | In the simulator, make sure that the preview thread is a Java thread, | Marco Nelissen | 2009-08-13 | 2 | -3/+18 |
* | | | | | resolved conflicts for merge of 4431a065 to master | Dianne Hackborn | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge change 21055 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
* | | | | | | | Merge change 21044 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
* | | | | | | | am c41dca14: Merge change 21045 into donut | Mike LeBeau | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge change 21045 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | am 370e1f74: Merge change 21038 into donut | Mike LeBeau | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge change 21038 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge change 21060 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | resolved conflicts for merge of 6550076f to master | Dianne Hackborn | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge change 21025 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ | Merge change 21059 | Android (Google) Code Review | 2009-08-12 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | make sure EGL_ANDROID_swap_rectangle is actually supported before using it | Mathias Agopian | 2009-08-12 | 1 | -4/+11 |
* | | | | | | | | | | Merge change 21057 | Android (Google) Code Review | 2009-08-12 | 2 | -12/+10 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Better error handling in EGL extensions | Mathias Agopian | 2009-08-12 | 2 | -12/+10 |
* | | | | | | | | | Merge change 21047 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge change 21035 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
* | | | | | | | | | Merge change 21032 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ | Merge change 21031 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ | Merge change 21030 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge change 20419 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge change 21010 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ | Merge change 20913 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge change 21006 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge change 20998 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge change 20982 | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | am fe6e733a: Merge change 20960 into donut | Dianne Hackborn | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge change 20960 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | am 4cc16a7b: Merge change 20859 into donut | jsh | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge change 20859 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | am 4c85f133: Merge change 20869 into donut | Karl Rosaen | 2009-08-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge change 20869 into donut | Android (Google) Code Review | 2009-08-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
* | | | | | | | | | | | am b8546001: Merge change 20878 into donut | Dianne Hackborn | 2009-08-12 | 2 | -5/+65 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge change 20878 into donut | Android (Google) Code Review | 2009-08-11 | 2 | -5/+65 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | |