tree e4ff432eca97dc11a4bcf3e3d5366a9df36080cc
parent a266119d041fe28deb0c5364ad1cc2b3ec90d90b
parent 4f1e51fe2b0c8236ec71f5adfc10513b2a8e36b7
author Zheng Fu <zhengfu@google.com> 1437180255 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437180255 +0000

am 4f1e51fe: am 8879cc75: am e5bd832d: Fix failing tests due to logic changes in the new aggregator.

* commit '4f1e51fe2b0c8236ec71f5adfc10513b2a8e36b7':
  Fix failing tests due to logic changes in the new aggregator.