tree 366f81f5f30f48e1ce0eedf84e751d0cbfd29fab
parent 793fc4e5d2c40753e0e325d98b6c36ca76d02a7e
parent d1710fbb4053f80103b740c8b393b6cb4a480d6f
author Adam Cohen <adamcohen@google.com> 1336553732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553732 -0700

am d1710fbb: Merge "Fixing folder order persistence (issue 6176721)" into jb-dev

* commit 'd1710fbb4053f80103b740c8b393b6cb4a480d6f':
  Fixing folder order persistence (issue 6176721)