tree 48e48dd5c67625c62bc673b4e87425847bfd6ce2
parent c20c9a3eb850e2b28e8fee1679e7b9bc0bfc8aba
author Michael Bestas <mikeioannina@gmail.com> 1446423026 +0200
committer Gerrit Code Review <gerrit@cyanogenmod.org> 1446576645 -0800

full_base: Fix mismerge

* Remove property that was mismerged in b3b47f8ecdc8c2657b34d89c3a8f40796a16f1f2

Change-Id: I18be52cc4a167f52150e56859f5139bda09d34e4