Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687 -s ours
am: ab4d629294 -s ours
* commit 'ab4d62929412556b90f8927fb05602d2e630518c':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
This commit is contained in: