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