tree 251c365d3956a4602f3a3ce0ca811f7f2860375e
parent 0d8b1bdcce553a60fb9112ca403c00ad9d8842a5
parent 5a9d721baece3144ec3b9f43715d1c112d90b3d6
author Jesse Hall <jessehall@google.com> 1412285077 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412285077 +0000

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

* commit '5a9d721baece3144ec3b9f43715d1c112d90b3d6':
  init.trace.rc: fix race condition with class_start core