tree bd1343d21091e4a56ffaa4f3fd1a5ba6cc27796b
parent 33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8
parent 3bf84d3250bf45f2a5b041245e9bd327e03e22c0
author Adam Cohen <adamcohen@google.com> 1336507946 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336507946 -0700

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