tree 52e87edcee1ac84da8948f40087f9cb291909f12
parent 5ab7ccdd37ad525a72392e9ae9d4960eba901bbd
parent c506ab89505f7adf5411f2418e48ea67acf03700
author Dan Morrill <morrildl@google.com> 1294948122 -0800
committer Dan Morrill <morrildl@google.com> 1294948122 -0800

Fix merge conflict for 'c506ab89'

Conflicts:
	NOTICE

Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6