tree 9c2bb9feac55df4d1a152803d00ad05e5b288097
parent 22d4c4a29c453ead99f5d2e7cbb01625ff32412a
parent 94355e03e8388b3c7a263c0c9da12bac8c9914f1
author Winson Chung <winsonc@google.com> 1321537562 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537562 -0800

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

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