tree 47f1ab5b73a4f434c830f4412691a9e687e110f6
parent 4282b97058d1bc5f434e9cf51afc96193f43dad4
parent c79daf522566655c5e18a62c54ae484d14de5373
author Mark Salyzyn <salyzyn@google.com> 1433280805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433280805 +0000

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

* commit 'c79daf522566655c5e18a62c54ae484d14de5373':
  rootdir: init.trace.rc too early