tree 8722045879f90d8d34bb14864714d3a2b288d69c
parent 449d5c91757922dda61c0dd158ae471a353ecb7c
parent 26ace12135a662ad864678c9fede9817e5c02b67
author Robin Lee <rgl@google.com> 1426800780 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426800780 +0000

am 26ace121: Don\'t clobber widgets with the same component.

* commit '26ace12135a662ad864678c9fede9817e5c02b67':
  Don't clobber widgets with the same component.