DESCRIPTION

Formatted code.

Change-Id: Ib5700f44129e5be33fee86f05b153527f66e9c01


COMMENTS

author: Kenny Maynard
date: 2011-08-13 00:23:25.102000000

Uploaded patch set 7.

-------------------------------------
author: Andreas Short
date: 2011-08-15 17:36:53.910000000

Patch Set 7: Looks good to me, approved

Would be slightly better by searching for those || and .get() type things on new lines, but that's minor in the overall scheme of things.

-------------------------------------
author: Tate Garrett
date: 2011-08-15 19:05:34.715000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
