tree bf77afa05e67e201d1bb49171fc036bfdc78a0b2
parent 27e427aaa2e56d68d914363df0c6b425837bab40
parent b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf
author Tom Cherry <tomcherry@google.com> 1441319315 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441319315 +0000

am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"

* commit 'b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf':
  move init.trace.rc to frameworks/native