tree a290e9e365d0ad5ca31b6fa0b6dd189f59c3ecfd
parent 539c87b29a38ea4910e0cb80d78525453047a3c0
parent 8418634e70e8e7743c76d9edce693fd7257aa3a2
author Yueyao Zhu <yueyao@google.com> 1496169740 +0000
committer android-build-merger <android-build-merger@google.com> 1496169740 +0000

Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc"
am: 8418634e70

Change-Id: I3848c66092e8f7f89e80697991df92a08a71e5ed