tree 4323b29691e4a2ae40ff7a6758e496d2b889e758
parent 13c690d42ce0266cc3c008342e27c480fa390e4b
parent 345ed924bac099236226c95eee925a91f6b75095
author Winson Chung <winsonc@google.com> 1321476384 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321476384 -0800

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

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