tree d4bac2766e50ad4b4890d776767e841a2f58d940
parent 797d8ff41429a40e616014514f047c34ef78db2c
parent 72aff731f0640ac6293b1ba73b6e4a5c37a2f864
author Daniel Sandler <dsandler@android.com> 1322772118 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322772118 -0800

am 72aff731: (-s ours) am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1

* commit '72aff731f0640ac6293b1ba73b6e4a5c37a2f864':
  Remove dependency on support library. DO NOT MERGE.