tree 9c2bb9feac55df4d1a152803d00ad05e5b288097
parent 55d513780ce67e006224a2108791e99f168b0555
parent dadbe6b7cac4122d0e2882660a10d5bdb4c64e67
author Winson Chung <winsonc@google.com> 1321537888 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537888 -0800

am dadbe6b7: am 94355e03: am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1

* commit 'dadbe6b7cac4122d0e2882660a10d5bdb4c64e67':
  Fixing small regressions in folder text offset. (Bug 5600902)