| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Move location provider lib to frameworks/ex - 2 | Laurent Tu | 2012-12-05 | 8 | -0/+637 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge from ur8 | mindyp | 2012-12-03 | 8 | -188/+435 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | am 4bd6592a: am 18bc55d1: Merge remote-tracking branch \'goog/jb-ub-mail\' in... | Paul Westbrook | 2012-11-27 | 1 | -12/+9 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | am 18bc55d1: Merge remote-tracking branch \'goog/jb-ub-mail\' into gmailmerge | Paul Westbrook | 2012-11-27 | 1 | -12/+9 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | am 160a0ef8: am f5ac3286: SMS text messaging omits numbers in parentheses | Tom Taylor | 2012-11-16 | 1 | -1/+11 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | am f5ac3286: SMS text messaging omits numbers in parentheses | Tom Taylor | 2012-11-15 | 1 | -1/+11 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | am e3c6084b: (-s ours) am a34f7115: Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-08 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | am a34f7115: Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-08 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | am 3a47ffb4: (-s ours) am 6297b872: Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-08 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | am 6297b872: Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-08 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | am a6292fc0: am 519f7918: am 797b22f9: Merge changes to chips from unbundled ... | mindyp | 2012-11-08 | 1 | -73/+86 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | am 519f7918: am 797b22f9: Merge changes to chips from unbundled branch: updat... | mindyp | 2012-11-08 | 1 | -73/+86 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am edca3dd4: am d00c91b9: am 06208d07: cherrypick: Reset maxlines when the us... | mindyp | 2012-11-08 | 1 | -2/+5 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | am d00c91b9: am 06208d07: cherrypick: Reset maxlines when the user expands text | mindyp | 2012-11-08 | 1 | -2/+5 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | add exponential backoff option to OperationScheduler | Doug Zongker | 2012-11-07 | 2 | -12/+81 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 08d75980: (-s ours) am 7af7b654: Reconcile with jb-mr1-factory-release jb-... | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7af7b654: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f4ec2c66: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release -... | The Android Open Source Project | 2012-10-31 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-31 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 28ed566a to master | Mark Wei | 2012-10-29 | 2 | -1/+6 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5f0470b2: Fix for panorama icon not always showing up in photo viewer. | Mark Wei | 2012-10-29 | 2 | -1/+6 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a27fb71f: (-s ours) am 939ce1b0: Restart loader on attachment cursor updates | Paul Westbrook | 2012-10-29 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 939ce1b0: Restart loader on attachment cursor updates | Paul Westbrook | 2012-10-29 | 1 | -1/+5 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f70a5e84: am 690abee6: Show old results | Paul Westbrook | 2012-10-25 | 1 | -5/+36 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 690abee6: Show old results | Paul Westbrook | 2012-10-25 | 1 | -5/+36 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow PhotoViewActivity to choose inital photo by uri | Martin Hibdon | 2012-10-16 | 2 | -1/+37 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0453ec9b: am b32dd40a: SMS text messaging omits numbers in parentheses | Tom Taylor | 2012-10-16 | 1 | -1/+11 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b32dd40a: SMS text messaging omits numbers in parentheses | Tom Taylor | 2012-10-16 | 1 | -1/+11 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5788646d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release -... | The Android Open Source Project | 2012-10-15 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-15 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e209312c: (-s ours) am 14a4df6f: Load preview first | Paul Westbrook | 2012-10-13 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 14a4df6f: Load preview first | Paul Westbrook | 2012-10-13 | 1 | -14/+12 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 777cea29: (-s ours) am da4cfeec: Set the scale type for the default image ... | Paul Westbrook | 2012-10-12 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am da4cfeec: Set the scale type for the default image icon | Paul Westbrook | 2012-10-12 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Temporary fix for image viewer crash" | Adam Copp | 2012-10-05 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary fix for image viewer crash | Adam Copp | 2012-10-05 | 1 | -0/+6 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4c9dbbf9: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-04 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-04 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 63414f62: am c16fb2a3: cherrypick: Make sure we check the most up to date ... | mindyp | 2012-10-03 | 1 | -5/+5 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c16fb2a3: cherrypick: Make sure we check the most up to date text for the ... | mindyp | 2012-10-03 | 1 | -5/+5 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c2ff4e6d: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-02 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-02 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b2d148b8: am 0c6fe7e6: cherrypick: Fix crashes associated with new logic t... | mindyp | 2012-10-01 | 1 | -4/+4 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0c6fe7e6: cherrypick: Fix crashes associated with new logic to replace ent... | mindyp | 2012-10-01 | 1 | -4/+4 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c930ef0a: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-26 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-26 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e16e5a89: am 3817205e: am 215b1c80: The "original text" is just what we ar... | mindyp | 2012-09-25 | 1 | -1/+1 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3817205e: am 215b1c80: The "original text" is just what we are putting in ... | mindyp | 2012-09-25 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of b3f0f056 to master | Paul Westbrook | 2012-09-25 | 2 | -3/+188 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3a539a30: am 5211e468: Add Exif parser | Paul Westbrook | 2012-09-25 | 2 | -170/+343 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
 |
index : android_frameworks_ex | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |