Commit 9a82a066 authored by Michael Kwan's avatar Michael Kwan Committed by Android Git Automerger
Browse files

am bd5888b6: resolved conflicts for merge of c17d8b21 to lmp-sprout-dev 

* commit 'bd5888b6':
  Excluded irrelevant tests for Android Watch devices
parents d7fbcc8f bd5888b6
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