| commit | 6056e46534c0570a1871c5e64e7067298f9090f0 | [log] [tgz] |
|---|---|---|
| author | Michael Bestas <mikeioannina@gmail.com> | Mon Nov 02 02:10:26 2015 +0200 |
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | Tue Nov 03 10:50:45 2015 -0800 |
| tree | 48e48dd5c67625c62bc673b4e87425847bfd6ce2 | |
| parent | c20c9a3eb850e2b28e8fee1679e7b9bc0bfc8aba [diff] |
full_base: Fix mismerge * Remove property that was mismerged in b3b47f8ecdc8c2657b34d89c3a8f40796a16f1f2 Change-Id: I18be52cc4a167f52150e56859f5139bda09d34e4