summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Fix wake up the screen, the video does not continue to play."Linux Build Service Account2015-03-231-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Gallery2: Fix wake up the screen, the video does not continue to play.kaiyiz2015-03-231-7/+13
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Remove wait when notify dirty"Linux Build Service Account2015-03-232-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Gallery2: Remove wait when notify dirtykaiyiz2015-03-212-6/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Don't bundle beautification libraries"Linux Build Service Account2015-03-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Gallery2: Don't bundle beautification librariesJay Wang2015-03-221-1/+0
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Remove the 'Make available offline'"Linux Build Service Account2015-03-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Gallery2: Remove the 'Make available offline'kaiyiz2015-03-201-0/+1
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Move files to the correct location"Linux Build Service Account2015-03-1910-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Gallery2: Move files to the correct locationJay Wang2015-03-1810-6/+0
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Modify:Gallery2 for branch Gallery2"Linux Build Service Account2015-03-1926-10/+716
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Modify:Gallery2 for branch Gallery2Zhang Zhenzhen2015-03-1826-10/+716
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Add "No faces" strings"Linux Build Service Account2015-03-185-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Gallery2: Add "No faces" stringsmqi2015-03-165-1/+8
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Gallery2 resources for beautification feature"Linux Build Service Account2015-03-1616-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Gallery2: Gallery2 resources for beautification featureByunghun Jeon2015-03-1216-0/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge "Merge 8f7f1987e30cac3e6918adefa2980c949f26ce30 on remote branch"Linux Build Service Account2015-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge 8f7f1987e30cac3e6918adefa2980c949f26ce30 on remote branchLinux Build Service Account2015-03-150-0/+0
|/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Pause video when dialog shows"Linux Build Service Account2015-03-092-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Gallery2: Pause video when dialog showskaiyiz2015-03-062-0/+14
| |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2 : Added support for Oma drm (CD and SD)"Linux Build Service Account2015-03-039-40/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Gallery2: Set video view visible"Linux Build Service Account2015-03-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Gallery2: Set video view visiblekaiyiz2015-03-121-2/+0
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: set the progress bar when we pause the video"Linux Build Service Account2015-03-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Gallery2: set the progress bar when we pause the videokaiyiz2015-03-061-0/+1
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Pause video when dialog shows"Linux Build Service Account2015-03-112-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Gallery2: Pause video when dialog showskaiyiz2015-03-112-0/+14
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge commit into AOSP_MERGENatiq Ahmed2015-03-105-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 62691568: (-s ours) am 5fe0d63f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5fe0d63f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am ed459a8f: (-s ours) am 5d95f0c5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 5d95f0c5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | am 0f5af786: am 014369d5: Bring Gallery2 manifest into parity with CROP supportAlan Newberger2014-09-181-3/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 014369d5: Bring Gallery2 manifest into parity with CROP supportAlan Newberger2014-09-181-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | am fbbc8f1e: (-s ours) am 58305fc4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am 58305fc4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Menu options list disappears very fast"Linux Build Service Account2015-03-053-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Gallery2: Menu options list disappears very fastkaiyiz2015-03-053-2/+27
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Gallery2: Allow edit if launched from Snapcam"Linux Build Service Account2015-02-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Gallery2: Allow edit if launched from SnapcamByunghun Jeon2015-02-241-1/+4
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge 78ae61f1f21a9164052dd16f85f086f033560440 on remote branch"Linux Build Service Account2015-02-236-11/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge 78ae61f1f21a9164052dd16f85f086f033560440 on remote branchLinux Build Service Account2015-02-226-11/+60
|/| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | 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 "Gallery2 : Added support for Oma drm (CD and SD)"Linux Build Service Account2015-02-179-40/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | / / / / / / / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Gallery2 : Added support for Oma drm (CD and SD)Paramananda2015-02-119-40/+21
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Merge 12cf0d082018c504db4839b8b162e1d17960c3ff on remote branch"Linux Build Service Account2015-02-164-45/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge 12cf0d082018c504db4839b8b162e1d17960c3ff on remote branchLinux Build Service Account2015-02-154-45/+55
|/| | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / /