tree e576f967f21e3d1a1a9716e6a17989f23e954cb5
parent 86c1866a95d8861a00413a1df6d99f6ba9c7037e
parent 99344c12183aa705c7c123744abd4972f161a2c4
author John Newlin <jnewlin@google.com> 1376665663 -0700
committer John Newlin <jnewlin@google.com> 1376665762 -0700

Merge remote-tracking branch 'gfiber-internal/vendor_drops' into merge27

Change-Id: I5320ae0ac8cca5ce01cb266c14c585a461da07ff