summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* OpenGL ES 1 YUV texturing testNuno Subtil2010-10-272-0/+352
* YUV texturing test.Michael I. Gold2010-10-272-0/+446
* Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952"Romain Guy2010-10-251-4/+10
|\
| * Don't initialize the hw renderer without a valid surface.Romain Guy2010-10-251-4/+10
* | am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into gin...Jeff Hamilton2010-10-251-0/+1
|\ \
| * \ am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbreadJeff Hamilton2010-10-251-0/+1
| |\ \
| | * \ Merge "Add a RHS status bar slot for NFC." into gingerbreadJeff Hamilton2010-10-251-0/+1
| | |\ \
| | | * | Add a RHS status bar slot for NFC.Jeff Hamilton2010-10-251-0/+1
* | | | | Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly ->...Adam Cohen2010-10-252-3/+10
|\ \ \ \ \
| * | | | | -> Fixing a bug where AdapterViewAnimator doesn't refresh correctlyAdam Cohen2010-10-252-3/+10
* | | | | | am 6c8d8d89: am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
| | |\ \ \ \
| | | * | | | GPS: Disable verbose loggingMike Lockwood2010-10-252-5/+7
* | | | | | | am e1ca532d: am 457bed2b: Merge "fix [3123221] Video sticks playing back upsi...Mathias Agopian2010-10-252-0/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down follo...Mathias Agopian2010-10-252-0/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "fix [3123221] Video sticks playing back upside down following orientat...Mathias Agopian2010-10-252-0/+16
| | |\ \ \ \ \
| | | * | | | | fix [3123221] Video sticks playing back upside down following orientation switchMathias Agopian2010-10-242-0/+16
* | | | | | | | am b4645353: am ce4d36ad: Merge "fix [3118445] Transform * Transform does not...Mathias Agopian2010-10-254-46/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expe...Mathias Agopian2010-10-254-46/+87
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "fix [3118445] Transform * Transform does not work as expected" into gi...Mathias Agopian2010-10-254-46/+87
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | fix [3118445] Transform * Transform does not work as expectedMathias Agopian2010-10-244-46/+87
* | | | | | | | Merge "Swipe up to open the settings panel. Tap anywhere to close."Daniel Sandler2010-10-251-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Swipe up to open the settings panel. Tap anywhere to close.Daniel Sandler2010-10-251-1/+31
* | | | | | | | | Merge "We don't have access to the md5 implementation on the simulator, let's...Andreas Huber2010-10-251-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | We don't have access to the md5 implementation on the simulator, let's disabl...Andreas Huber2010-10-251-0/+10
| |/ / / / / / / /
* | | | | | | | | am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - tim...Adam Powell2010-10-250-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test Expand...Adam Powell2010-10-251-1/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewB...Adam Powell2010-10-251-1/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | DO NOT MERGE Fix bug 3124899 - timeout in CTS testAdam Powell2010-10-251-1/+3
* | | | | | | | | | Merge "Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framew...Marco Nelissen2010-10-254-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework.Marco Nelissen2010-10-254-0/+10
* | | | | | | | | | | Merge "increase sql statement printed in finalier warnings from 100 to 1000"Vasu Nori2010-10-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | increase sql statement printed in finalier warnings from 100 to 1000Vasu Nori2010-10-252-2/+2
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge "when printing cache-full warning, print the sql statements in cache"Vasu Nori2010-10-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | when printing cache-full warning, print the sql statements in cacheVasu Nori2010-10-251-0/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge "Fix drags from the shirt pocket"Daniel Sandler2010-10-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix drags from the shirt pocketChris Tate2010-10-221-1/+1
* | | | | | | | | | | resolved conflicts for merge of 177b05d6 to masterScott Main2010-10-251-54/+58
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am abb50f15: Merge "docs: fix a couple api links" into gingerbreadScott Main2010-10-251-55/+59
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "docs: fix a couple api links" into gingerbreadScott Main2010-10-251-55/+59
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | docs: fix a couple api linksScott Main2010-10-211-55/+59
* | | | | | | | | | Merge "Fix ratingBarStyleSmall style in Holo theme."Adam Powell2010-10-251-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix ratingBarStyleSmall style in Holo theme.Mathew Inwood2010-10-251-2/+2
* | | | | | | | | | am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods....Nick Pelly2010-10-253-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into ginger...Nick Pelly2010-10-253-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Fixed NdefTag parcelable conversion methods." into gingerbreadNick Pelly2010-10-253-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed NdefTag parcelable conversion methods.Sylvain Fonteneau2010-10-253-2/+2
* | | | | | | | | | | am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaroun...Wu-cheng Li2010-10-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do...Wu-cheng Li2010-10-252-11/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /