| commit | ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Oct 23 19:47:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 19:47:18 2014 +0000 |
| tree | c6ebda490db0029127db701ede9762696b7a1157 | |
| parent | 8fff0a24bcf94aec450755572f7a19891da12242 [diff] | |
| parent | 68335df6e6134c919f8575aa52e11872642848ad [diff] |
am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev * commit '68335df6e6134c919f8575aa52e11872642848ad': Fix damage bug