Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissi... | Dirk Dougherty | 2010-11-02 | 5 | -483/+1159 |
|\ | |||||
| * | am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." in... | Dirk Dougherty | 2010-11-02 | 5 | -483/+1159 |
| |\ | |||||
| | * | Merge "Doc change: Update uses-feature and permissions docs." into froyo | Dirk Dougherty | 2010-11-02 | 5 | -483/+1159 |
| | |\ | |||||
| | | * | Doc change: Update uses-feature and permissions docs. | Dirk Dougherty | 2010-11-02 | 5 | -483/+1159 |
* | | | | am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements" | Brad Fitzpatrick | 2010-11-02 | 1 | -11/+14 |
|\ \ \ \ | |||||
| * \ \ \ | Merge "NotificationManager: droiddoc documentation improvements" | Brad Fitzpatrick | 2010-11-02 | 1 | -11/+14 |
| |\ \ \ \ | |||||
| | * | | | | NotificationManager: droiddoc documentation improvements | Peter Collingbourne | 2010-10-14 | 1 | -11/+14 |
* | | | | | | am ef8a810b: Merge "Update of DRM framework" | Gloria Wang | 2010-11-02 | 25 | -566/+374 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Update of DRM framework" | Gloria Wang | 2010-11-02 | 25 | -566/+374 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update of DRM framework | Takeshi Aimi | 2010-11-02 | 25 | -566/+374 |
* | | | | | | | am 38e561dd: Merge "Remove timeout support." into gingerbread | Nick Pelly | 2010-11-02 | 4 | -60/+0 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge "Remove timeout support." into gingerbread | Nick Pelly | 2010-11-02 | 4 | -60/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove timeout support. | Nick Pelly | 2010-11-02 | 4 | -60/+0 |
* | | | | | | | | am bbd212d7: Merge "Document per-implementation behaviors of native get* meth... | Jean-Baptiste Queru | 2010-11-02 | 1 | -0/+44 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "Document per-implementation behaviors of native get* methods" | Jean-Baptiste Queru | 2010-11-02 | 1 | -0/+44 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Document per-implementation behaviors of native get* methods | Daniel Trebbien | 2010-11-02 | 1 | -0/+44 |
* | | | | | | | | | am 715f8610: Merge "Clarify documentation of Cursor get* methods." | Jean-Baptiste Queru | 2010-11-02 | 1 | -16/+32 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Clarify documentation of Cursor get* methods." | Jean-Baptiste Queru | 2010-11-02 | 1 | -16/+32 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Clarify documentation of Cursor get* methods. | Daniel Trebbien | 2010-11-02 | 1 | -16/+32 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" int... | Gloria Wang | 2010-11-02 | 2 | -24/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp | Gloria Wang | 2010-11-02 | 2 | -24/+14 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "- Move the business rule management down to DRM agents. - Do not regis... | Gloria Wang | 2010-11-01 | 2 | -24/+14 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | - Move the business rule management down to DRM agents. | Gloria Wang | 2010-11-01 | 2 | -24/+14 |
* | | | | | | | | | am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index pag... | Joe Malin | 2010-11-02 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into ging... | Joe Malin | 2010-11-02 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | DOC CHANGE: Add entry for monkeyrunner to tools index page. | Joe Malin | 2010-11-01 | 1 | -0/+5 |
* | | | | | | | | | | am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gi... | Raphael | 2010-11-02 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge "Support for <compatible-screens><screen> in ADT." into gingerbread | Raphael | 2010-11-02 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Support for <compatible-screens><screen> in ADT. | Raphael | 2010-10-27 | 1 | -1/+2 |
* | | | | | | | | | am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread | Gilles Debunne | 2010-11-02 | 186 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Rescaled/updated mdpi assets added." into gingerbread | Gilles Debunne | 2010-11-02 | 186 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Rescaled/updated mdpi assets added. | Gilles Debunne | 2010-11-01 | 186 | -0/+0 |
* | | | | | | | | | | am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread | Gilles Debunne | 2010-11-02 | 82 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Rescaled/updated mdpi assets added." into gingerbread | Gilles Debunne | 2010-11-02 | 82 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Rescaled/updated mdpi assets added. | Gilles Debunne | 2010-11-01 | 82 | -0/+0 |
| | |/ / / / / / / / | |||||
* | | | | | | | | | | am a87ea46c: Fix bugs related to cheek event suppression. | Jeff Brown | 2010-11-01 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Fix bugs related to cheek event suppression. | Jeff Brown | 2010-11-01 | 2 | -5/+5 |
* | | | | | | | | | | am 5dda76a7: Adding some StorageManager integration test infrastructure and s... | Neal Nguyen | 2010-11-01 | 9 | -0/+888 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Adding some StorageManager integration test infrastructure and some basic tests. | Neal Nguyen | 2010-11-01 | 9 | -0/+888 |
* | | | | | | | | | | am bd06f02d: Cleaning up some more flakiness in DownloadManager tests. | Neal Nguyen | 2010-11-01 | 2 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Cleaning up some more flakiness in DownloadManager tests. | Neal Nguyen | 2010-11-01 | 2 | -6/+11 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool | Joe Malin | 2010-11-01 | 8 | -63/+2668 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool | Joe Malin | 2010-11-01 | 8 | -63/+2668 |
* | | | | | | | | | am ccb75a88: Merge "Update the API file." into gingerbread | Dan Bornstein | 2010-11-01 | 1 | -12/+12 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Update the API file." into gingerbread | Dan Bornstein | 2010-11-01 | 1 | -12/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update the API file. | Dan Bornstein | 2010-11-01 | 1 | -12/+12 |
* | | | | | | | | | | am fea07c60: am eda78cea: docs: update dashboard | Scott Main | 2010-11-01 | 1 | -19/+18 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am eda78cea: docs: update dashboard | Scott Main | 2010-11-01 | 1 | -19/+18 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | docs: update dashboard | Scott Main | 2010-11-01 | 1 | -19/+18 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread | Leon Scroggins | 2010-11-01 | 3 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |