commit | bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398 | [log] [tgz] |
---|---|---|
author | Steve Kondik <steve@cyngn.com> | Sat Oct 17 23:40:33 2015 -0700 |
committer | Steve Kondik <steve@cyngn.com> | Sat Oct 17 23:40:33 2015 -0700 |
tree | 85d07b2095695fe79235ab16e627f8b22c7bfd8d | |
parent | a3fcd50080c0546ebd5f0caf932eef02fabdd7ad [diff] | |
parent | 8de528917bf03cca93ac2a3dd19b7a5719d1a26e [diff] |
Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0 Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2