tree 9290822d8d70b96bae0f063eff0b55900e933379
parent a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c
parent 10b131314d461d5fd94aeff0565942e04d03e16b
author Jesse Hall <jessehall@google.com> 1412284175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412284175 +0000

am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev

* commit '10b131314d461d5fd94aeff0565942e04d03e16b':
  init.trace.rc: fix race condition with class_start core