tree f550026a277b6b4696dc2a1ba1081b2bb0e1d505
parent 1bf05273dcdefd2ef139e167d0c097a9daf64398
parent 5397380528fdbb80e32094d1313d8ee308f8528c
author Xavier Ducrohet <xav@android.com> 1323741684 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323741684 -0800

am 53973805: am 56259594: Merge "Move support lib to rev 6." into ics-mr1

* commit '5397380528fdbb80e32094d1313d8ee308f8528c':
  Move support lib to rev 6.