tree 213333d0209a2753c2e0028dab46f69a28c41e7e
parent 26ace12135a662ad864678c9fede9817e5c02b67
parent 2dd9f018ff32a1f34023826b64422622f6610daf
author Robin Lee <rgl@google.com> 1426800811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426800811 +0000

am 2dd9f018: (-s ours) Don\'t clobber widgets with the same component - DO NOT MERGE

* commit '2dd9f018ff32a1f34023826b64422622f6610daf':
  Don't clobber widgets with the same component - DO NOT MERGE