tree c6ebda490db0029127db701ede9762696b7a1157
parent 8fff0a24bcf94aec450755572f7a19891da12242
parent 68335df6e6134c919f8575aa52e11872642848ad
author John Reck <jreck@google.com> 1414093638 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414093638 +0000

am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev

* commit '68335df6e6134c919f8575aa52e11872642848ad':
  Fix damage bug