| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 135 | -821/+821 |
| |\ | |||||
| | * | Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 135 | -821/+821 |
| | |\ | |||||
| | | * | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) | Steve Block | 2012-01-19 | 135 | -821/+821 |
| * | | | Merge ee4618bc | Jean-Baptiste Queru | 2012-01-19 | 200 | -3144/+3144 |
| |\ \ \ | |/ / | |||||
| | * | | Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 200 | -3143/+3143 |
| | |\ \ | | |/ | |||||
| | | * | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) | Steve Block | 2012-01-19 | 200 | -3143/+3143 |
| | |/ | |||||
| * | | am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" | Jean-Baptiste Queru | 2012-01-19 | 9 | -20/+20 |
| |\ \ | |/ | |||||
| | * | Merge "Rename (IF_)LOG() to (IF_)ALOG()" | Jean-Baptiste Queru | 2012-01-19 | 9 | -20/+20 |
| | |\ | |||||
| | | * | Rename (IF_)LOG() to (IF_)ALOG() | Steve Block | 2012-01-18 | 9 | -20/+20 |
| | |/ | |||||
| * | | am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 | Robert Ly | 2012-01-19 | 10 | -759/+10053 |
| |\ \ | |||||
| | * \ | resolved conflicts for merge of b078d942 to ics-mr1 | Robert Ly | 2012-01-19 | 10 | -759/+10053 |
| | |\ \ | |||||
| | | * | | cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e11... | Robert Ly | 2012-01-19 | 10 | -760/+10054 |
| * | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-19 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-18 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-13 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-12 | 0 | -0/+0 |
| | | | |\ \ \ \ | |||||
| * | | | \ \ \ \ | am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 | Robert Ly | 2012-01-19 | 2 | -0/+614 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | | am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 | Robert Ly | 2012-01-19 | 2 | -0/+614 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | | Merge "docs: wifi direct" into ics-mr0 | Robert Ly | 2012-01-19 | 2 | -0/+614 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | docs: wifi direct | Robert Ly | 2012-01-18 | 2 | -0/+614 |
| * | | | | | | | | am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into... | Jim Miller | 2012-01-18 | 6 | -0/+37 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 | Jim Miller | 2012-01-18 | 6 | -0/+37 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix 5863053: Add method to lock screen immediately. | Jim Miller | 2012-01-17 | 6 | -0/+37 |
| * | | | | | | | | | am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ... | Eric Laurent | 2012-01-18 | 2 | -6/+21 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 | Eric Laurent | 2012-01-18 | 2 | -6/+21 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | AudioFlinger: mix track only when really ready (2) | Eric Laurent | 2012-01-18 | 2 | -6/+21 |
| * | | | | | | | | | | am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call wit... | Wink Saville | 2012-01-18 | 1 | -4/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change... | Wink Saville | 2012-01-18 | 1 | -4/+11 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Use new preferredAPN URI avoiding onApnChanged() call with self-change | Wink Saville | 2012-01-17 | 1 | -4/+11 |
| | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | | am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles we... | Adam Powell | 2012-01-18 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectl... | Adam Powell | 2012-01-18 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fix DeviceDefault theme/style bugs where parent styles were | Adam Powell | 2012-01-17 | 2 | -4/+4 |
| | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | | am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 | Robert Ly | 2012-01-18 | 54 | -0/+14374 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "docs: adding rs api docs" into ics-mr1 | Robert Ly | 2012-01-18 | 54 | -0/+14374 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | docs: adding rs api docs | Robert Ly | 2012-01-17 | 54 | -0/+14374 |
| * | | | | | | | | | | | am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links... | Robert Ly | 2012-01-18 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge "update overview page for rs api docs to open iframe links in parent" i... | Robert Ly | 2012-01-18 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | update overview page for rs api docs to open iframe links in parent | Robert Ly | 2012-01-13 | 1 | -3/+3 |
| * | | | | | | | | | | | | am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 | Joe Fernandez | 2012-01-18 | 1 | -5/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 | Joe Fernandez | 2012-01-18 | 1 | -5/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | docs: Android API 15 SDK r2 Release Notes | Joe Fernandez | 2012-01-17 | 1 | -5/+22 |
| | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | | am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit vers... | Scott Main | 2012-01-13 | 1 | -8/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge "docs: emphasize qualifier order and mention implicit version qualifer"... | Scott Main | 2012-01-13 | 1 | -8/+16 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | docs: emphasize qualifier order and mention implicit version qualifer | Scott Main | 2012-01-13 | 1 | -8/+16 |
| * | | | | | | | | | | | | am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 | Scott Main | 2012-01-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "docs: mention x86 as a native platform filter" into ics-mr1 | Scott Main | 2012-01-13 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | docs: mention x86 as a native platform filter | Scott Main | 2012-01-13 | 1 | -2/+2 |
| | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | | am cc7bd5ab: Merge "Update notification documentation to follow current guide... | Dianne Hackborn | 2012-01-13 | 3 | -103/+154 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "Update notification documentation to follow current guidelines." into ... | Dianne Hackborn | 2012-01-13 | 3 | -103/+154 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Update notification documentation to follow current guidelines. | Dianne Hackborn | 2012-01-12 | 3 | -103/+154 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |