tree 23cd831eaefb97f5a0feb08a2deb7af68d2d754f
parent 8d5e8dfdf0bdf629820164043d7ca891c29b2525
parent 67d5cc47c99afa9325868ba5baf06d8d90beb393
author Ruchi Kandoi <kandoiruchi@google.com> 1478217497 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1478217497 +0000

Merge changes Ibbf34025,I154c2dc4

* changes:
  memtrack: Add init_rc file for the android.hardware.memtrack@1.0-service
  power: Add init_rc for android.hardware.power@1.0-service