summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Support querying account and picasa id of a picasa image.Owen Lin2011-12-142-12/+32
* Improve Doodle UI for ending Doodle effect.Yuli Huang2011-12-062-7/+32
* Fix effect-label layout and a TODO.Yuli Huang2011-12-0522-167/+160
* Merge "Simplify EffectAction."Yuli Huang2011-12-0213-51/+39
|\
| * Simplify EffectAction.Yuli Huang2011-12-0313-51/+39
* | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-020-0/+0
|\ \ | |/ |/|
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| |\
* | | Remove unnecessary code.Yuli Huang2011-12-021-43/+6
* | | Merge "Refactor to remove obsolete design and improve code consistency."Yuli Huang2011-12-0250-500/+241
|\ \ \
| * | | Refactor to remove obsolete design and improve code consistency.Yuli Huang2011-12-0250-500/+241
* | | | am a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT ME...Daniel Sandler2011-12-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1Daniel Sandler2011-12-011-2/+1
| |\ \ \
| | * | | Remove dependency on support library. DO NOT MERGE.Daniel Sandler2011-12-011-2/+1
* | | | | resolved conflicts for merge of c0715fd5 to masterJeff Sharkey2011-12-012-2/+8
|\| | | |
| * | | | Add close() to Download cache.Owen Lin2011-12-012-4/+10
| |/ / /
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-290-0/+0
| | |\ \
* | | | | am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a packag...Chih-Chung Chang2011-11-302-0/+4
|\| | | |
| * | | | Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/...Chih-Chung Chang2011-11-292-0/+4
| |\ \ \ \
| | * | | | Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)Chih-Chung Chang2011-11-302-0/+4
* | | | | | am 002a3fec: Fix 5686493: Crash when try to click any thumbnailChih-Chung Chang2011-11-301-1/+3
|\| | | | |
| * | | | | Fix 5686493: Crash when try to click any thumbnailChih-Chung Chang2011-11-301-1/+3
| |/ / / /
* | | | | am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1Daniel Sandler2011-11-302-15/+55
|\| | | |
| * | | | Merge "Improve screen on/off logic in slideshow." into ics-mr1Daniel Sandler2011-11-292-15/+55
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Improve screen on/off logic in slideshow.Daniel Sandler2011-11-292-15/+55
* | | | | am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1Wei Huang2011-11-298-46/+76
|\| | | |
| * | | | Merge "Show a dialog to require updating PlusOne." into ics-mr1Wei Huang2011-11-298-46/+76
| |\ \ \ \
| | * | | | Show a dialog to require updating PlusOne.Owen Lin2011-11-248-46/+76
| | |/ / /
* | | | / am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from g...Chih-Chung Chang2011-11-292-0/+63
|\| | | | | |_|_|/ |/| | |
| * | | Fix 5661035: Accepts bluetooth keys while playing a video from gallery.Chih-Chung Chang2011-11-292-0/+63
| |/ /
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| |\ \ | | |/ | |/|
* | | am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail ...Chih-Chung Chang2011-11-211-7/+19
|\| |
| * | Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachm...Chih-Chung Chang2011-11-211-7/+19
| |\ \
| | * | Fix 5637927: NPE while trying to do slide show for gmail image attachmentChih-Chung Chang2011-11-181-7/+19
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| |\ \ \
| | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | |\ \ \
* | | | \ \ \ am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option an...Ray Chen2011-11-182-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix 5635260 Albums view goes blank after changing view option and returning t...Ray Chen2011-11-182-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause."...Wei Huang2011-11-182-5/+22
|\| | | | |
| * | | | | Merge "Make sure startAnimation won't be called after onPause." into ics-mr1Wei Huang2011-11-172-5/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make sure startAnimation won't be called after onPause.Owen Lin2011-11-172-5/+22
| | |/ / /
* | | | | am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'r...Ray Chen2011-11-162-4/+8
|\| | | |
| * | | | Fix 5611147 attachments (picture) can't be viewed after they're savedRay Chen2011-11-162-4/+8
* | | | | am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot i...Wei Huang2011-11-159-41/+128
|\| | | |
| * | | | Merge "Fix 5481444 Face clustering should use PWA profile shot instead of ran...Wei Huang2011-11-159-41/+128
| |\ \ \ \
| | * | | | Fix 5481444 Face clustering should use PWA profile shot instead of random photoRay Chen2011-11-119-41/+128