tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 94aa42cbe1d9ab2e7cecd18a67765567f797ea27
parent 579a34186f801f7d70ac05feb380b1a3480e6d31
author Adam Cohen <adamcohen@google.com> 1392410126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410126 +0000

am 579a3418: am 35ef6aae: am 0655904a: Fixing regression in reordering (issue 10994971)

* commit '579a34186f801f7d70ac05feb380b1a3480e6d31':