summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1caf/cm-12.1Matt Garnes2015-05-0582-750/+1183
|\
| * Merge "Gallery2 : Video share option is not working"Linux Build Service Account2015-04-161-3/+5
| |\
| | * Gallery2 : Video share option is not workingParamananda2015-04-161-3/+5
| * | Merge "Gallery2 : Delete and Details options are not visible on Camera preview"Linux Build Service Account2015-04-142-4/+4
| |\|
| | * Gallery2 : Delete and Details options are not visible on Camera previewParamananda2015-04-132-4/+4
| * | Merge "Gallery2 : Drm file can be set as wallpaper"Linux Build Service Account2015-04-081-0/+4
| |\ \
| | * | Gallery2 : Drm file can be set as wallpaperParamananda2015-04-061-0/+4
| | |/
| * | Merge "Gallery2: Gallery2 can't show the newest picture"Linux Build Service Account2015-04-071-0/+10
| |\ \ | | |/ | |/|
| | * Gallery2: Gallery2 can't show the newest picturewangjing2015-04-031-0/+10
| * | Merge "Gallery2 : Drm lock icon added on Photo widget for drm content"Linux Build Service Account2015-04-054-4/+83
| |\ \
| | * | Gallery2 : Drm lock icon added on Photo widget for drm contentParamananda2015-04-024-4/+83
| * | | Merge "Gallery2 : GIF animated drm file can be visible in Gallery app"Linux Build Service Account2015-04-051-0/+20
| |\| |
| | * | Gallery2 : GIF animated drm file can be visible in Gallery appParamananda2015-04-021-0/+20
| * | | Merge "Gallery2 : Uses internal Drm image decoder api in Gallery app"Linux Build Service Account2015-04-0527-702/+274
| |\| | | | |/ | |/|
| | * Gallery2 : Uses internal Drm image decoder api in Gallery appParamananda2015-04-0227-702/+274
| * | Merge "Gallery2: The spinner icon display different on Gallery home page and ...Linux Build Service Account2015-04-021-1/+1
| |\ \ | | |/ | |/|
| | * Gallery2: The spinner icon display different on Gallery homekaiyiz2015-04-011-1/+1
| |/
| * Merge "Gallery2: Modify the action of rewind and forward button" into LA.BR.1...Linux Build Service Account2015-03-301-2/+14
| |\
| | * Gallery2: Modify the action of rewind and forward buttonkaiyiz2015-03-231-2/+14
| * | 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 remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1Matt Garnes2015-03-2616-54/+63
|\| | | |
| * | | | 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
| | | |\ \ \ \