tree bbf38d73a01ff21880a6a6c50b9cb498513de95e
parent 57ee9998fa9d7e6d4a9096bcca4e60686f9175aa
parent 41fdacc58c59c35b456197d356bd6f12f6897d8e
author Dave Borowitz <dborowitz@google.com> 1379535185 -0700
committer Dave Borowitz <dborowitz@google.com> 1379535185 -0700

Merge branch 'stable-2.7'

Conflicts:
	pom.xml

Change-Id: I0d66a5aac03deaae41130ba2756acdc65a370458