tree d0185f1c9c34829c7b30084e3bb586e08e1ffcad
parent ba9e35344664b9e2ab37d35326cfeac8a32a4e16
parent bd2a7dc6cc3d5cecf3cb1d05d7ff37b6706f6821
author Dmitry Shmidt <dimitrysh@google.com> 1469123821 +0000
committer android-build-merger <android-build-merger@google.com> 1469123821 +0000

Merge \\"init.hikey.rc: remove permission setting on /dev/cpuctl\\" am: f914ccd828
am: bd2a7dc6cc

Change-Id: I30239f55c5ace8ac9da1e7b65acc295512c062bc