tree f90a37b45223f0bf3d068d48d35574f6c5f956f3
parent 4068e1d0eb1e7b5b1dd9f92d84f93c1e401e3cb5
parent 3c68bdb26643eacbb411759799f6fcfb934c34eb
author Adam Cohen <adamcohen@google.com> 1337825029 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337825029 -0700

am 3c68bdb2: am d024f984: Cleaning up some reordering issues:

* commit '3c68bdb26643eacbb411759799f6fcfb934c34eb':
  Cleaning up some reordering issues: