tree a57fcd0a868e12d8cd63dc7388ca68acfcb4e395
parent 2b3396f9c0e88d1633e16483322d2c52cfc271f3
parent e0489500d2a2cf410cb3cb687cbc59e966d7084e
author Adam Cohen <adamcohen@google.com> 1346113630 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346113631 -0700

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