tree 2c49e576438322b68869d846a387e6ca77be6497
parent 4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521
parent 1a6030e76fa5fa0c0a19aeb7d7a53070b9438ea6
author John Reck <jreck@android.com> 1346799452 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346799452 -0700

am 1a6030e7: Merge "Remove inconsistency between HistoryItem writing/reading"

* commit '1a6030e76fa5fa0c0a19aeb7d7a53070b9438ea6':
  Remove inconsistency between HistoryItem writing/reading