tree 6b4a098516f9fb53299502d6bad30246b982ded5
parent aaef6b71e637487e689d622d07443b7d1823e7ad
parent c1d2a896a72ab7a0636abafdaf45c6f524730d7c
author Adam Cohen <adamcohen@google.com> 1346113927 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346113927 -0700

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

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