| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | Merge "docs: add developer guide cross-references, Project ACRE, Round 2" int... | Joe Fernandez | 2011-10-14 | 14 | -13/+104 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | docs: add developer guide cross-references, Project ACRE, Round 2 | Joe Fernandez | 2011-10-14 | 14 | -13/+104 | |
| * | | | | | | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-14 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-13 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ | am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption passwo... | Christopher Tate | 2011-10-14 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge "DO NOT MERGE - Require device encryption password for adb backup/resto... | Christopher Tate | 2011-10-14 | 5 | -7/+171 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | DO NOT MERGE - Require device encryption password for adb backup/restore | Christopher Tate | 2011-10-13 | 5 | -7/+171 | |
| * | | | | | | | | | | | | | | am 00005385: Merge "Use ringer assets for notification volume since the two v... | Amith Yamasani | 2011-10-14 | 1 | -44/+63 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge "Use ringer assets for notification volume since the two volumes are ti... | Amith Yamasani | 2011-10-14 | 1 | -44/+63 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Use ringer assets for notification volume since the two volumes are tied. | Amith Yamasani | 2011-10-12 | 1 | -44/+63 | |
| * | | | | | | | | | | | | | | | am 33210ec1: Merge "change android beam sample name" into ics-mr0 | Scott Main | 2011-10-14 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge "change android beam sample name" into ics-mr0 | Scott Main | 2011-10-14 | 2 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | change android beam sample name | Scott Main | 2011-10-14 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | | | | am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility manageme... | Jim Miller | 2011-10-14 | 3 | -19/+123 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Fix 5358124: Better transport control visibility management in lock sc... | Jim Miller | 2011-10-14 | 3 | -19/+123 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | Fix 5358124: Better transport control visibility management in lock screen | Jim Miller | 2011-10-13 | 3 | -19/+123 | |
| | | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ... | Daniel Sandler | 2011-10-14 | 2 | -7/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Shrink the ticker's icon to match the status bar." into ics-mr0 | Daniel Sandler | 2011-10-14 | 2 | -7/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Shrink the ticker's icon to match the status bar. | Daniel Sandler | 2011-10-14 | 2 | -7/+18 | |
| * | | | | | | | | | | | | | | | | am 43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0 | Peter Ng | 2011-10-14 | 12 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Stat icons for phone are now the right size" into ics-mr0 | Peter Ng | 2011-10-14 | 12 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | Stat icons for phone are now the right size | Peter Ng | 2011-10-13 | 12 | -0/+0 | |
| * | | | | | | | | | | | | | | | | | am d82cc1de: Merge "Fixup JNI" into ics-mr0 | John Reck | 2011-10-14 | 1 | -15/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | Merge "Fixup JNI" into ics-mr0 | John Reck | 2011-10-14 | 1 | -15/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Fixup JNI | John Reck | 2011-10-13 | 1 | -15/+15 | |
| * | | | | | | | | | | | | | | | | | am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect err... | Jean-Michel Trivi | 2011-10-14 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | Merge "Fix 5380695 Lockscreen transport control must reflect error state" int... | Jean-Michel Trivi | 2011-10-14 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | Fix 5380695 Lockscreen transport control must reflect error state | Jean-Michel Trivi | 2011-10-13 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | am b9c9cf65: Merge "Fix 5367082 correct assets for "next" and "previous" in l... | Jean-Michel Trivi | 2011-10-14 | 7 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" in... | Jean-Michel Trivi | 2011-10-14 | 7 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Fix 5367082 correct assets for "next" and "previous" in lockscreen | Jean-Michel Trivi | 2011-10-13 | 7 | -2/+2 | |
| | | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am e48440d5: Merge "Fix 5153611 remove remote control client/display log from... | Jean-Michel Trivi | 2011-10-14 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge "Fix 5153611 remove remote control client/display log from AudioService... | Jean-Michel Trivi | 2011-10-14 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Fix 5153611 remove remote control client/display log from AudioService | Jean-Michel Trivi | 2011-10-13 | 1 | -2/+1 | |
| | | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Allow setting of source bounds on global search intents." | Mathew Inwood | 2011-10-14 | 1 | -2/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Allow setting of source bounds on global search intents. | Mathew Inwood | 2011-10-14 | 1 | -2/+20 | |
| * | | | | | | | | | | | | | | | | | am 23b80f08: Merge "docs: add new screenshots for hc gallery sample" into ics... | Scott Main | 2011-10-14 | 2 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge "docs: add new screenshots for hc gallery sample" into ics-mr0 | Scott Main | 2011-10-14 | 2 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | docs: add new screenshots for hc gallery sample | Scott Main | 2011-10-14 | 2 | -0/+0 | |
| * | | | | | | | | | | | | | | | | | | am 6b1531ee: Merge "docs: preliminary homepage announcement (offline version)... | Scott Main | 2011-10-14 | 2 | -10/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0 | Scott Main | 2011-10-14 | 2 | -10/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | docs: preliminary homepage announcement (offline version) | Scott Main | 2011-10-14 | 2 | -10/+6 | |
| | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | am e1e9e937: docs: revisions to ics api overview | Scott Main | 2011-10-14 | 2 | -556/+759 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | docs: revisions to ics api overview | Scott Main | 2011-10-14 | 2 | -556/+759 | |
| | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 F... | Steven Ross | 2011-10-13 | 1 | -21/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341"... | Steven Ross | 2011-10-13 | 1 | -21/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341 | Steven Ross | 2011-10-13 | 1 | -21/+19 | |
| * | | | | | | | | | | | | | | | | | am 2ce6882b: Fixed problem where Face Unlock area was showing | Brian Colonna | 2011-10-13 | 1 | -2/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fixed problem where Face Unlock area was showing | Brian Colonna | 2011-10-13 | 1 | -2/+8 | |
| | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am 3505abf3: Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0 | Brian Colonna | 2011-10-13 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |