Commit eb03c715 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 266a65b5: resolved conflicts for merge of c9285ae2 to jb-mr2-dev 

* commit '266a65b5':
  Adding a widget to perform a few basic tests of the widget framework
parents d5c106cc 266a65b5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment