| commit | 0dafebaf07fbf6f80b3ff669a0add4343a4eb709 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Jul 24 18:32:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 24 18:32:20 2014 +0000 |
| tree | 3fb49abf8e6eed4e8fd888b5233437015cc72292 | |
| parent | 8d19f7c3312029751a640abf659e80563111f4e9 [diff] | |
| parent | 204e57c43824413d6e15fdf05c490ed4d869d44e [diff] |
am 204e57c4: resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp * commit '204e57c43824413d6e15fdf05c490ed4d869d44e': Fix stale remembered sets error.