summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge change 21207 into eclairAndroid (Google) Code Review2009-08-130-0/+0
|\
* | ui: make native_window_set_usage be a static inlineDima Zavin2009-08-131-1/+1
|/
* Merge change 21171Android (Google) Code Review2009-08-130-0/+0
|\
* \ Merge change 21166Android (Google) Code Review2009-08-130-0/+0
|\ \
* \ \ Merge change 21186Android (Google) Code Review2009-08-130-0/+0
|\ \ \
* \ \ \ Merge change 21162Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \
* \ \ \ \ Merge change 21185Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ | |/ / / /
* | | | | Merge change 21159Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge change 21152Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge change 21134Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge change 20853Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge change 21158Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge change 21153Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | Modified the camera HAL interface to use the same generic callback architectu...Benny Wong2009-08-136-365/+374
| |_|_|_|/ |/| | | |
* | | | | Merge change 21090Android (Google) Code Review2009-08-130-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
* | | | | Merge change 21106Android (Google) Code Review2009-08-132-3/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | In the simulator, make sure that the preview thread is a Java thread,Marco Nelissen2009-08-132-3/+18
* | | | | resolved conflicts for merge of 4431a065 to masterDianne Hackborn2009-08-120-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge change 21055 into donutAndroid (Google) Code Review2009-08-120-0/+0
| |\ \ \ \ \
* | | | | | | Merge change 21044Android (Google) Code Review2009-08-120-0/+0
* | | | | | | am c41dca14: Merge change 21045 into donutMike LeBeau2009-08-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge change 21045 into donutAndroid (Google) Code Review2009-08-120-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am 370e1f74: Merge change 21038 into donutMike LeBeau2009-08-120-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change 21038 into donutAndroid (Google) Code Review2009-08-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
* | | | | | | Merge change 21060Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of 6550076f to masterDianne Hackborn2009-08-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge change 21025 into donutAndroid (Google) Code Review2009-08-120-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge change 21059Android (Google) Code Review2009-08-121-4/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | make sure EGL_ANDROID_swap_rectangle is actually supported before using itMathias Agopian2009-08-121-4/+11
* | | | | | | | | | Merge change 21057Android (Google) Code Review2009-08-122-12/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Better error handling in EGL extensionsMathias Agopian2009-08-122-12/+10
* | | | | | | | | Merge change 21047Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge change 21035Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
* | | | | | | | | Merge change 21032Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge change 21031Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge change 21030Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
* | | | | | | | | | | Merge change 20419Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge change 21010Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge change 20913Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge change 21006Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge change 20998Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge change 20982Android (Google) Code Review2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | am fe6e733a: Merge change 20960 into donutDianne Hackborn2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge change 20960 into donutAndroid (Google) Code Review2009-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
* | | | | | | | | | am 4cc16a7b: Merge change 20859 into donutjsh2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge change 20859 into donutAndroid (Google) Code Review2009-08-120-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am 4c85f133: Merge change 20869 into donutKarl Rosaen2009-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge change 20869 into donutAndroid (Google) Code Review2009-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
* | | | | | | | | | | am b8546001: Merge change 20878 into donutDianne Hackborn2009-08-122-5/+65
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge change 20878 into donutAndroid (Google) Code Review2009-08-112-5/+65
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
generated by cgit v1.1 at 2024-09-11 23:49:02 +0000