tree 359de0f685eb1a9b34db7dc687c1249f45669749
parent f04bcb228db735725b6743068490a2001fd90d37
parent f45c934be48342dec8aa12190845f415133272a4
author John Newlin <jnewlin@google.com> 1408986857 -0700
committer John Newlin <jnewlin@google.com> 1409005530 -0700

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

Change-Id: I99d608fe04627af10d4cc5cbe5b3dfa117d07ca2