tree cba62d0d64153aa2169651696bc238591341d679
parent 104ffe503ff7050e8af67832b5685f68b8e3b9a4
parent cbe7025e590b93d98d344ee845991f665b38df3b
author Adam Cohen <adamcohen@google.com> 1414085214 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085214 +0000

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

* commit 'cbe7025e590b93d98d344ee845991f665b38df3b':