tree bf77afa05e67e201d1bb49171fc036bfdc78a0b2
parent 18696d920993931619a79621adc9647030df49cc
parent 98731daf6563ecbaf268997fdc3f1d48c949b32a
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