tree e52a3f522bc470b7fd6a99f6b4298429b70c4316
parent 5cc55bead1ebca56997b3af97e6880e54295f0e3
parent 28b952ad3ec46ba9d14063797c1c96984ade8deb
author Adam Cohen <adamcohen@google.com> 1337006951 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337006951 -0700

am 28b952ad: Merge "Fix folder order regression (issue 6482634)" into jb-dev

* commit '28b952ad3ec46ba9d14063797c1c96984ade8deb':
  Fix folder order regression (issue 6482634)