tree 6d521c62a98b8eef2c28187bfe84ab0e459a7206
parent c489dd26e2e32e1a841155e95c315e07f89dbb95
parent a8e55d279df901a649296560d9af04a42cfc6a86
author Paul Mclean <pmclean@google.com> 1445018321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445018321 +0000

am a8e55d27: Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev

* commit 'a8e55d279df901a649296560d9af04a42cfc6a86':
  Fix test incompatibilities with Nemo (watch) device.