OSDN Git Service

am 204e57c4: resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Thu, 24 Jul 2014 18:32:20 +0000 (18:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 18:32:20 +0000 (18:32 +0000)
* commit '204e57c43824413d6e15fdf05c490ed4d869d44e':
  Fix stale remembered sets error.


Trivial merge