| commit | ec3fe183eb432b6541513196e52167ecd7826631 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Thu Mar 19 21:33:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 21:33:31 2015 +0000 |
| tree | 213333d0209a2753c2e0028dab46f69a28c41e7e | |
| parent | 26ace12135a662ad864678c9fede9817e5c02b67 [diff] | |
| parent | 2dd9f018ff32a1f34023826b64422622f6610daf [diff] |
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