summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissi...Dirk Dougherty2010-11-025-483/+1159
|\
| * am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." in...Dirk Dougherty2010-11-025-483/+1159
| |\
| | * Merge "Doc change: Update uses-feature and permissions docs." into froyoDirk Dougherty2010-11-025-483/+1159
| | |\
| | | * Doc change: Update uses-feature and permissions docs.Dirk Dougherty2010-11-025-483/+1159
* | | | am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"Brad Fitzpatrick2010-11-021-11/+14
|\ \ \ \
| * \ \ \ Merge "NotificationManager: droiddoc documentation improvements"Brad Fitzpatrick2010-11-021-11/+14
| |\ \ \ \
| | * | | | NotificationManager: droiddoc documentation improvementsPeter Collingbourne2010-10-141-11/+14
* | | | | | am ef8a810b: Merge "Update of DRM framework"Gloria Wang2010-11-0225-566/+374
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update of DRM framework"Gloria Wang2010-11-0225-566/+374
| |\ \ \ \ \
| | * | | | | Update of DRM frameworkTakeshi Aimi2010-11-0225-566/+374
* | | | | | | am 38e561dd: Merge "Remove timeout support." into gingerbreadNick Pelly2010-11-024-60/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Remove timeout support." into gingerbreadNick Pelly2010-11-024-60/+0
| |\ \ \ \ \ \
| | * | | | | | Remove timeout support.Nick Pelly2010-11-024-60/+0
* | | | | | | | am bbd212d7: Merge "Document per-implementation behaviors of native get* meth...Jean-Baptiste Queru2010-11-021-0/+44
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Document per-implementation behaviors of native get* methods"Jean-Baptiste Queru2010-11-021-0/+44
| |\ \ \ \ \ \ \
| | * | | | | | | Document per-implementation behaviors of native get* methodsDaniel Trebbien2010-11-021-0/+44
* | | | | | | | | am 715f8610: Merge "Clarify documentation of Cursor get* methods."Jean-Baptiste Queru2010-11-021-16/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Clarify documentation of Cursor get* methods."Jean-Baptiste Queru2010-11-021-16/+32
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Clarify documentation of Cursor get* methods.Daniel Trebbien2010-11-021-16/+32
| |/ / / / / / /
* | | | | | | | Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" int...Gloria Wang2010-11-022-24/+14
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of c1c45a4d to gingerbread-plus-aospGloria Wang2010-11-022-24/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "- Move the business rule management down to DRM agents. - Do not regis...Gloria Wang2010-11-012-24/+14
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
* | | | | | | | | am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index pag...Joe Malin2010-11-021-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into ging...Joe Malin2010-11-021-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | DOC CHANGE: Add entry for monkeyrunner to tools index page.Joe Malin2010-11-011-0/+5
* | | | | | | | | | am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gi...Raphael2010-11-021-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge "Support for <compatible-screens><screen> in ADT." into gingerbreadRaphael2010-11-021-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Support for <compatible-screens><screen> in ADT.Raphael2010-10-271-1/+2
* | | | | | | | | am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-02186-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-02186-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rescaled/updated mdpi assets added.Gilles Debunne2010-11-01186-0/+0
* | | | | | | | | | am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-0282-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-0282-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rescaled/updated mdpi assets added.Gilles Debunne2010-11-0182-0/+0
| | |/ / / / / / / /
* | | | | | | | | | am a87ea46c: Fix bugs related to cheek event suppression.Jeff Brown2010-11-012-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix bugs related to cheek event suppression.Jeff Brown2010-11-012-5/+5
* | | | | | | | | | am 5dda76a7: Adding some StorageManager integration test infrastructure and s...Neal Nguyen2010-11-019-0/+888
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Adding some StorageManager integration test infrastructure and some basic tests.Neal Nguyen2010-11-019-0/+888
* | | | | | | | | | am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.Neal Nguyen2010-11-012-6/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Cleaning up some more flakiness in DownloadManager tests.Neal Nguyen2010-11-012-6/+11
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
* | | | | | | | | am ccb75a88: Merge "Update the API file." into gingerbreadDan Bornstein2010-11-011-12/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Update the API file." into gingerbreadDan Bornstein2010-11-011-12/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update the API file.Dan Bornstein2010-11-011-12/+12
* | | | | | | | | | am fea07c60: am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | docs: update dashboardScott Main2010-11-011-19/+18
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbreadLeon Scroggins2010-11-013-0/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /