tree 4edfa29da93cd71ae10111c39778fd203d54fb76
parent 75215303cc0351fdc4385e4e42bdb1486032b031
parent f75a2cf06c67ec376c435ff0c88785de6dd2d822
author Adam Cohen <adamcohen@google.com> 1339194946 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339194946 -0700

am f75a2cf0: am 8ec23033: Fix subtle folder jank related to previous change

* commit 'f75a2cf06c67ec376c435ff0c88785de6dd2d822':
  Fix subtle folder jank related to previous change