| commit | 85dc67e45058a02275c1db724627a512efede76e | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Thu Mar 19 21:37:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 21:37:11 2015 +0000 |
| tree | 8722045879f90d8d34bb14864714d3a2b288d69c | |
| parent | 8b35317955d04f96cb3d7922ce55c178034a7703 [diff] | |
| parent | ec3fe183eb432b6541513196e52167ecd7826631 [diff] |
am ec3fe183: (-s ours) am 2dd9f018: (-s ours) Don\'t clobber widgets with the same component - DO NOT MERGE * commit 'ec3fe183eb432b6541513196e52167ecd7826631': Don't clobber widgets with the same component - DO NOT MERGE