tree 11451d99530a7af75da44de5f723d0d04a9de8fb
parent a4065a4b257d055c46a06c9d9b9fd9e4c0931577
author Marko Man <darkobas@gmail.com> 1507626247 +0200
committer Marko Man <darkobas@gmail.com> 1507626247 +0200

aosp-merge: fix build/make path

also squash build make as usually there is nothing usefull, but release version changes

Change-Id: I8a79e87d2b2d79138b4478c2e07ed9410d5d1b85