tree f90a37b45223f0bf3d068d48d35574f6c5f956f3
parent 47bbf0d1d73bce72bca4fe1a419d636ed156410f
parent d024f9845a0974ab525baad085f316031cd5a742
author Adam Cohen <adamcohen@google.com> 1337824904 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337824904 -0700

am d024f984: Cleaning up some reordering issues:

* commit 'd024f9845a0974ab525baad085f316031cd5a742':
  Cleaning up some reordering issues: