tree 76c1dd647e5f424928b242a7d8f0a07b19318939
parent 99a1d50262c78af21f4cf55422551d04af6f1682
parent ae1bf3808a2274b55c6dcd386745d9082d22efb4
author Ke Dong <kedong@google.com> 1365727067 -0700
committer Ke Dong <kedong@google.com> 1365727067 -0700

Merge remote-tracking branch 'remotes/gfiber-internal/master' into master_merge

Conflicts:
	default.xml

Change-Id: I7fadc567e9364c070539a5d2a735c1776051f3b3