tree aff9fdfc95a08f056960ca5f4e85596e28d62afa
parent 60d033305d4211ca47db2aa35654a4fdc24d4bed
parent 813a5ea3c2a0ca96b6fe1fd1066942fe0303852b
author John Newlin <jnewlin@google.com> 1389802810 -0800
committer John Newlin <jnewlin@google.com> 1389802820 -0800

Merge remote-tracking branch 'gfiber-internal/vendor_drops' into merge_rc11.3

Change-Id: Ibdf93626acf566c18622a468b0ed1077a0fed1b1