tree de8b89eed64bc9c013dfa3f33fdf2344f45a0cbf
parent 79568720bfb745c5c136d4fbb5031a0b7e2e95ea
parent ea0818d475df26d498ce08105bc2bc5582fce5a9
author Adam Cohen <adamcohen@google.com> 1317438620 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317438620 -0700

Merge "Small fix in Folder text editing"