tree f37ea0ea54cd599ff1b0d0c62c7891bbce146b93
parent 525e16a2e70bdbc1bc325fcfeda71f30f910d161
parent 4912723b8cab17d2fbd91d82a55e8091d68e432a
author Ed Heyl <edheyl@google.com> 1355854713 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355854713 -0800

am 4912723b: (-s ours) Revert 948cc9d4: Adding support for simplified collection widgets. Do not merge.

* commit '4912723b8cab17d2fbd91d82a55e8091d68e432a':
  Revert 948cc9d4: Adding support for simplified collection widgets. Do not merge.