tree de8b89eed64bc9c013dfa3f33fdf2344f45a0cbf
parent 2bef72a12ae1a2985394aa27eabf847026faa584
parent 3918640c2b0845b7647d5ecf4c0e4f80ade58a79
author Adam Cohen <adamcohen@google.com> 1317438710 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317438710 -0700

am 3918640c: Merge "Small fix in Folder text editing"

* commit '3918640c2b0845b7647d5ecf4c0e4f80ade58a79':
  Small fix in Folder text editing