tree 6d8f6f24472bbe59dc2889a28fff941bbb5a2e84
parent 9d16d2072be18b1734c22cd58cd9a07af28ede41
parent 78a1c9067fec4664e36df5b0ccbc4e16979fcb35
author Android (Google) Code Review <android-gerrit@google.com> 1242700473 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242700473 -0700

Merge change 1939 into donut

* changes:
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.