tree f864ff869185b2873637ca70584c66fd6a1e899d
parent ed0fb05bfe993dcdc655de3b09335af5bf9fb331
parent 233f32ec80ad3e45d6efce993d1108cf8d1b7784
author Ian Rogers <irogers@google.com> 1376288302 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376288302 -0700

am 233f32ec: (-s ours) am 468532ea: Entry point clean up.

* commit '233f32ec80ad3e45d6efce993d1108cf8d1b7784':
  Entry point clean up.