tree 4edfa29da93cd71ae10111c39778fd203d54fb76
parent 001a17fcf5b825801bc9987cebab9411ce329f9d
parent 8ec2303379eb467e063113385c9514063abed787
author Adam Cohen <adamcohen@google.com> 1339194648 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339194648 -0700

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

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