| commit | eb03c715b6866e11889cf487eff2b2aa9947914a | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Mon May 20 17:36:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 17:36:13 2013 -0700 |
| tree | d7168c497be49dc2cc7a81ad1fb36c09f2974c37 | |
| parent | d5c106ccba9720fb25a68a8cfa56b857d422fc13 [diff] | |
| parent | 266a65b594bde81e02e0abdde1ad3ecd3c85da46 [diff] |
am 266a65b5: resolved conflicts for merge of c9285ae2 to jb-mr2-dev * commit '266a65b594bde81e02e0abdde1ad3ecd3c85da46': Adding a widget to perform a few basic tests of the widget framework