tree 36fa822433b36fe56cfaf184e235974097af777a
parent 358aed4587c3c278bff61b90291d4e69ab6b5b04
parent 141823ec6313d9545b8354ea1e3e017a1da3cfa8
author John Reck <jreck@google.com> 1414623003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414623003 +0000

am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev

* commit '141823ec6313d9545b8354ea1e3e017a1da3cfa8':
  Be more conservative about current buffer