summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.caf/cm-12.0Matt Garnes2015-03-044-7/+17
|\
| * Merge "Gallery2 - Add support to pass in a playlist along with video to play"bait_dispatcher_monitor_system2015-02-202-4/+43
| |\
| | * Gallery2 - Add support to pass in a playlist along with video to playRohit Yengisetty2015-02-192-4/+43
| |/
| * Merge "Gallery2: Translate image draw to Chinese"bait_dispatcher_monitor_system2015-02-194-7/+17
| |\
| | * Gallery2: Translate image draw to Chinesekaiyiz2015-02-154-7/+17
| |/
* | Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.Matt Garnes2015-02-236-46/+62
|\|
| * Merge "Galler2 : Load onResume on separate thread"Linux Build Service Account2015-02-132-10/+37
| |\
| | * Galler2 : Load onResume on separate threadSuresh Kamasala2015-02-122-10/+37
| * | Merge "Gallery2: Enable Suspend/Resume"Linux Build Service Account2015-02-131-33/+8
| |\ \
| | * | Gallery2: Enable Suspend/Resumemqi2015-02-121-33/+8
| | |/
| * | Merge "Gallery2: request thumb if fail to get region decoder"Linux Build Service Account2015-02-131-2/+10
| |\ \ | | |/ | |/|
| | * Gallery2: request thumb if fail to get region decoderkaiyiz2015-02-111-2/+10
| |/
| * Merge "Revert "Gallery2: Grant permission to read/write files of Settings.""Linux Build Service Account2015-02-051-1/+0
| |\
| | * Revert "Gallery2: Grant permission to read/write files of Settings."Jing Wang2015-01-301-1/+0
| * | Merge "Gallery2: Notify dirty after update content"Linux Build Service Account2015-02-051-0/+7
| |\ \
| | * | Gallery2: Notify dirty after update contentkaiyiz2015-02-041-0/+7
| |/ /
* | | Gallery2 - Add support to pass in a playlist along with video to playRohit Yengisetty2015-02-192-4/+43
* | | Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0.Matt Garnes2015-02-136-4/+41
|\| |
| * | Merge "Gallery2: Seek to trim start time only once when playing"Linux Build Service Account2015-02-021-1/+4
| |\ \
| | * | Gallery2: Seek to trim start time only once when playinglubiny2015-02-011-1/+4
| |/ /
| * | Merge "Gallery2: Fix force close issue when mute some videos"Linux Build Service Account2015-01-312-3/+18
| |\ \
| | * | Gallery2: Fix force close issue when mute some videosxiaoqiny2015-01-302-3/+18
| |/ /
| * | Merge "Gallery2: Set PhotoPage GL root reset when rotate"Linux Build Service Account2015-01-302-0/+18
| |\ \
| | * | Gallery2: Set PhotoPage GL root reset when rotatekaiyiz2015-01-292-0/+18
| * | | Merge "Gallery2: Grant permission to read/write files of Settings."Linux Build Service Account2015-01-281-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Gallery2: Grant permission to read/write files of Settings.kaiyiz2015-01-281-0/+1
| |/
* | Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.Matt Garnes2015-01-2945-78/+922
|\|
| * Merge "Gallery2: Edit picture during mount SD"Linux Build Service Account2015-01-221-1/+1
| |\
| | * Gallery2: Edit picture during mount SDkaiyiz2015-01-211-1/+1
| * | Merge "Gallery2: Make Gallery2 support OMADRM feature"Linux Build Service Account2015-01-2230-35/+782
| |\ \
| | * | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-2030-35/+782
| * | | Merge "Gallery2: Fix Gallery2 crash caused by monkey test."Linux Build Service Account2015-01-211-2/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Gallery2: Fix Gallery2 crash caused by monkey test.kaiyiz2015-01-201-2/+5
| |/ /
| * | Merge "Gallery2: Pause music playback while playing video"Linux Build Service Account2015-01-201-0/+9
| |\ \ | | |/ | |/|
| | * Gallery2: Pause music playback while playing videoSurajit Podder2015-01-111-0/+9
| * | Merge "Gallery2: Fix color chooser"Linux Build Service Account2015-01-172-1/+13
| |\ \
| | * | Gallery2: Fix color chooserkaiyiz2015-01-142-1/+13
| * | | Merge "Gallery2: Add null pointer judgement for monkey"Linux Build Service Account2015-01-162-1/+4
| |\ \ \
| | * | | Gallery2: Add null pointer judgement for monkeykaiyiz2015-01-122-1/+4
| * | | | Merge "Gallery2: Set APN setting intent's name"Linux Build Service Account2015-01-161-7/+4
| |\ \ \ \
| | * | | | Gallery2: Set APN setting intent's namekaiyiz2015-01-151-7/+4
| | | |/ / | | |/| |
| * | | | Merge "Gallery2: Set read only image unEditable"Linux Build Service Account2015-01-161-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Gallery2: Set read only image unEditablekaiyiz2015-01-141-1/+1
| |/ / /
| * | | Merge "Gallery2: fix the video playback after system language changed"Linux Build Service Account2015-01-131-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Gallery2: fix the video playback after system language changedLi Sun2015-01-121-0/+3
| | |/
| * | Merge "Gallery2: Fix force close issue when trim video"Linux Build Service Account2015-01-122-2/+11
| |\ \ | | |/ | |/|
| | * Gallery2: Fix force close issue when trim videoxiaoqiny2014-12-254-3/+16
| * | Merge "Gallery2: Add leave selection mode judgement"Linux Build Service Account2015-01-041-1/+1
| |\ \
| | * | Gallery2: Add leave selection mode judgementJing (Mia) Wang2015-01-031-1/+1
| * | | Merge "Gallery2: Fix crop after straighten bug"Linux Build Service Account2015-01-041-0/+3
| |\ \ \ | | |/ / | |/| |