tree 3dbbe3f941fa98476e881d911f6c6586d91b0147
parent 81c9713ea8762d876c9b1c8370fc03be35b32c40
parent 89b7ab4cc6e5372bb4dabcc06a907fc333eca3f6
author Ian Rogers <irogers@google.com> 1389724249 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389724249 -0800

am 89b7ab4c: Merge "Add systrace regions for file opening during setup."

* commit '89b7ab4cc6e5372bb4dabcc06a907fc333eca3f6':
  Add systrace regions for file opening during setup.