tree 1dfd940fe5904f6ca26ef2e0bb4618c32b52e51d
parent 7091f908ebe52701dfc11daea34410dcde86fdc5
parent b9e55995411cc4390972a552e5361727ad795374
author Dmitri Plotnikov <dplotnikov@google.com> 1255049490 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255049490 -0700

am b9e55995: [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest

Merge commit 'b9e55995411cc4390972a552e5361727ad795374' into eclair-plus-aosp

* commit 'b9e55995411cc4390972a552e5361727ad795374':
  [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest