tree 79e69384df5032c4fb820a4be42a69b3defc15bd
parent 9f45473991d1900f19b425486aaa365c99ff3feb
parent b8244b43e2c2471c1bf89448a002d432b3a47600
author John Newlin <jnewlin@google.com> 1396459917 -0700
committer John Newlin <jnewlin@google.com> 1396459956 -0700

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

Change-Id: I57f5bc36b6433ccb4514e6a131af2d1f022968cc