commit | 1fb3b1a89a81c24cfff63caf6c094d2085d0c726 | [log] [tgz] |
---|---|---|
author | Zhentao Sun <robinvane@google.com> | Fri Sep 13 17:14:51 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 17:14:51 2013 -0700 |
tree | 301adb395899144a8c060bcb99e683bca0d5bd01 | |
parent | 91ff1f69085d268210858183580032e1901c4e5a [diff] | |
parent | 77710bf129fc4140f6b58b05072186f6ba068416 [diff] |
am 77710bf1: am c0e22fe7: (-s ours) am 8548c24e: Fixed flaky proximity alert tests. DO NOT MERGE. * commit '77710bf129fc4140f6b58b05072186f6ba068416': Fixed flaky proximity alert tests. DO NOT MERGE.