summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Workaround for preview frame rate setting and encoder profile and level setti...James Dong2010-05-202-4/+2
* am fa6ee245: am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
|\
| * am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| |\
| | * docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
* | | added RWLock C++ wrapperMathias Agopian2010-05-191-0/+90
* | | Merge "Initial software encoder checkins" into krakenJames Dong2010-05-19217-42/+44262
|\ \ \
| * | | Initial software encoder checkinsJames Dong2010-05-19217-42/+44262
* | | | Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into krakenWink Saville2010-05-192-153/+165
|\ \ \ \
| * | | | Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage.Wink Saville2010-05-192-153/+165
| |/ / /
* | | | am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyoScott Main2010-05-191-3/+2
|\ \ \ \ | | |/ / | |/| |
| * | | am 8d0e37f5: Merge "docs: revise platform intro" into froyoScott Main2010-05-191-3/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge "docs: revise platform intro" into froyoScott Main2010-05-191-3/+2
| | |\ \
| | | * | docs: revise platform introScott Main2010-05-191-3/+2
* | | | | am ee1cdd0e: merge from open-source masterThe Android Open Source Project2010-05-191-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source masterThe Android Open Source Project2010-05-191-0/+3
| |\ \ \ \
| | * \ \ \ Merge "Don't allow invalid Uris to be added as observers."Romain Guy2010-05-191-0/+3
| | |\ \ \ \
| | | * | | | Don't allow invalid Uris to be added as observers.Anthony Newnam2010-05-191-0/+3
* | | | | | | am 2b544c9f: merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix isssue 2548710: Native AudioTrack resources never freed."Jean-Baptiste Queru2010-05-191-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix isssue 2548710: Native AudioTrack resources never freed.Eric Laurent2010-05-181-1/+1
* | | | | | | | am 2dc7c6c4: merge from open-source masterThe Android Open Source Project2010-05-192-0/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-05-192-0/+19
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"Romain Guy2010-05-192-0/+19
| | |\ \ \ \ \ \
| | | * | | | | | Add and document .nomedia constant for MediaStore (Issue 6365)Karl Ostmo2010-05-172-0/+19
| | | | |/ / / / | | | |/| | | |
* | | | | | | | am faf9a783: merge from open-source masterThe Android Open Source Project2010-05-191-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-05-191-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Text disappears when selecting text in text editor."Romain Guy2010-05-191-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Text disappears when selecting text in text editor.Viktor Yakovel2010-04-211-0/+4
* | | | | | | | | am d6c0bb0f: merge from open-source masterThe Android Open Source Project2010-05-194-10/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-194-11/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Removed Calls to deprecated APIs"Romain Guy2010-05-194-12/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Removed Calls to deprecated APIsChristian Mehlmauer2010-05-174-12/+5
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | am aa2fe148: merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Improved error handling when font loading fails."Romain Guy2010-05-181-0/+3
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Improved error handling when font loading fails.Peter Eliasson2010-04-261-0/+3
* | | | | | | | | Merge "disable emma instrumentation for framework, ext and services (DO NOT M...Guang Zhu2010-05-182-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | disable emma instrumentation for framework, ext and services (DO NOT MERGE)Guang Zhu2010-05-182-1/+9
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "add execution permission to "input" script (DO NOT MERGE)" into krakenGuang Zhu2010-05-181-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add execution permission to "input" script (DO NOT MERGE)Guang Zhu2010-05-181-0/+0
| |/ / / / / / / /
* | | | | | | | | Update NativeActivity to allow direct surface access.Dianne Hackborn2010-05-184-21/+261
|/ / / / / / / /
* | | | | | | | am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP...Suchi Amalapurapu2010-05-181-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTe...Suchi Amalapurapu2010-05-181-3/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into ...Suchi Amalapurapu2010-05-181-3/+2
| | |\ \ \ \ \ \
| | | * | | | | | Uncomment a test that was marked as STOPSHIPSuchi Amalapurapu2010-05-181-3/+2
* | | | | | | | | am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Removing STOPSHIP logs.Jaikumar Ganesh2010-05-181-1/+1