tree f6299710c7500a1a9e7d1decb944d45a42ad0f83
parent 0fc857318c8584db8fd927b42265fa488ee20964
parent 66e39275be57352e357d8c5cdff73bc911758daa
author Mark Salyzyn <salyzyn@google.com> 1433279353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433279353 +0000

am 66e39275: Merge "rootdir: init.trace.rc too early"

* commit '66e39275be57352e357d8c5cdff73bc911758daa':
  rootdir: init.trace.rc too early