tree 414a62573b7a1e3b345635edffdfa581f7c56f43
parent 100dc50d0b40330cb0e189653d1965ab1c20095b
parent 56259594da620757e95172ef6ff68cade501da51
author Xavier Ducrohet <xav@android.com> 1323738136 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323738136 -0800

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

* commit '56259594da620757e95172ef6ff68cade501da51':
  Move support lib to rev 6.