summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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 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 2dc7c6c4: merge from open-source masterThe Android Open Source Project2010-05-191-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source masterThe Android Open Source Project2010-05-191-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"Romain Guy2010-05-191-0/+8
| | |\ \ \
| | | * | | Add and document .nomedia constant for MediaStore (Issue 6365)Karl Ostmo2010-05-171-0/+8
| | | |/ /
* | | | | 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-193-9/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-193-10/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Removed Calls to deprecated APIs"Romain Guy2010-05-193-11/+4
| | |\ \ \ \
| | | * | | | Removed Calls to deprecated APIsChristian Mehlmauer2010-05-173-11/+4
| | | | |/ / | | | |/| |
* | | | | | Update NativeActivity to allow direct surface access.Dianne Hackborn2010-05-182-20/+100
| |_|_|_|/ |/| | | |
* | | | | 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
* | | | | | | am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the c...Suchi Amalapurapu2010-05-181-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9a212adc: Fix 2641875 Initialize the cache path only if the container exis...Suchi Amalapurapu2010-05-181-2/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix 2641875Suchi Amalapurapu2010-05-181-2/+3
* | | | | | | Add new API to take over a window's Surface.Dianne Hackborn2010-05-186-20/+179
* | | | | | | am 4547e528: merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Removed Calls to deprecated APIs and unused ImportsChristian Mehlmauer2010-05-174-11/+4
| | | |_|/ / | | |/| | |
* | | | | | am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | docs: fix markup errorScott Main2010-05-181-1/+2
* | | | | | am fbb285e6: am e64256d6: Merge "docs: revise webview description and add inf...Scott Main2010-05-171-20/+103
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e64256d6: Merge "docs: revise webview description and add info for targeti...Scott Main2010-05-171-20/+103
| |\ \ \ \ \ | | |/ / / /
| | * | | | docs: revise webview description and add info for targeting screen densitiesScott Main2010-05-171-20/+103
* | | | | | Merge " ConnectivityManagerTestActivity can be launched from launcher. Help ...Xia Wang2010-05-172-4/+10
|\ \ \ \ \ \
| * | | | | | ConnectivityManagerTestActivity can be launched from launcher.Xia Wang2010-05-172-4/+10
* | | | | | | am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareS...Mike Lockwood2010-05-171-0/+26
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder...Mike Lockwood2010-05-171-0/+26
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-171-0/+26
* | | | | | | am 8ea405d1: am cfa2de30: Import revised translationsKenny Root2010-05-1720-52/+52
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am cfa2de30: Import revised translationsKenny Root2010-05-1720-52/+52
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Import revised translationsKenny Root2010-05-1720-52/+52
* | | | | | | resolved conflicts for merge of f7fb5331 to krakenJean-Baptiste Queru2010-05-171-0/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-171-0/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |