tree a57fcd0a868e12d8cd63dc7388ca68acfcb4e395
parent 96e180528b1084b5c3c6bbc284f8c218f071c37d
parent 13bdaf7c9d3e4539e2db5d9f4c2bb4d8b7a8dd79
author Adam Cohen <adamcohen@google.com> 1346113778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346113778 -0700

am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev

* commit '13bdaf7c9d3e4539e2db5d9f4c2bb4d8b7a8dd79':
  Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)