tree fcf120f4da2d6b5b0f21ce22b4b490af425be029
parent 4f378eafa225183a2b1ff92f7d336c6493d1103f
parent d326ff9a2528ad632c7845ae58d8377581cebf5d
author Gregory Poist <poist@google.com> 1471470216 -0700
committer Gregory Poist <poist@google.com> 1471470389 -0700

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

Change-Id: If9a347e461af21e1052553b9e27c414d09109ad6