tree 1383bcda3f68acb21aa092664f5c982ae8a2a73e
parent 10532abdff4f771fd2847da9509512a474217e67
parent a4a53664446b5f6a466b386773d89ff992093617
author Shawn Pearce <sop@google.com> 1385526605 -0800
committer Shawn Pearce <sop@google.com> 1385526636 -0800

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Performance Fix: Minimize number of advertisedHaves

Change-Id: Id19a9ef22aa7445bf8188b79d34aeb870eadb988