tree 4e6a8a2427213384a61a929704be4da5a92c2a58
parent 9f988c6e5b1e07f66479f0d4d08537281fa4694f
parent 23bde32a6f67ef39f2a368851e3abbedc50db710
author Dave Borowitz <dborowitz@google.com> 1379535061 -0700
committer Dave Borowitz <dborowitz@google.com> 1379535061 -0700

Merge branch 'stable-2.7'

Conflicts:
	pom.xml

Change-Id: I1aa397364c36a78e5725d59cf586af5d040cc350