tree cb5ac0842bfeaf3f90c23a5441e30b46cab263af
parent ca2bf81b02c99afa2e76b3b2c6eb232c239221e0
author John Reck <jreck@google.com> 1376501862 -0700
committer John Reck <jreck@google.com> 1376522659 -0700

Merge seek support from 1.2 to 1.6

Change-Id: Ibf0212bade0dc007c540d498244434cb09b92099