diff options
| author | Matt Garnes <matt@cyngn.com> | 2015-04-30 11:01:17 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-05-05 10:43:36 -0700 |
| commit | fbab7f32d2014c2bdae4eccf99d31ca76d0bf8f6 (patch) | |
| tree | 4b71b113c9c910bd4cb95efe81e84517634b3aa9 /gallerycommon | |
| parent | 3fcec525d3dc64e34539734bbcaf3471f40ec2db (diff) | |
| parent | 725da2fbd78bf38ff71bdbe9e1f27667dbf0fa73 (diff) | |
| download | android_packages_apps_Gallery2-caf/cm-12.1.tar.gz android_packages_apps_Gallery2-caf/cm-12.1.tar.bz2 android_packages_apps_Gallery2-caf/cm-12.1.zip | |
Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1caf/cm-12.1
Conflicts:
res/layout/action_mode.xml
Change-Id: Id4005a098134f089e904ed090acec7ca6f786ad1
Diffstat (limited to 'gallerycommon')
0 files changed, 0 insertions, 0 deletions