tree d8af6524e139e73dee173bbe8b8f1b1510a885d4
parent 81aef807d5f1e3e3b5eda1162829e666c295f352
parent 950ff1b88cc1330f8e80d62ed3aa15bee6be0556
author John Reck <jreck@google.com> 1414593601 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414593602 +0000

Merge "Be more conservative about current buffer" into lmp-mr1-dev