tree 70d1bcb8faa8e9fa5cfb3abae8fc29ed9be21235
parent ff01727c4c069c2c395cc795ed297a544ceab13a
parent 9ed742cd9b19ab9390c97b3c35f7af443428ccbf
author Andy Huang <ath@google.com> 1403132197 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403131638 +0000

Merge "support for subclass-custom span convert behavior" into ub-gmail-ur13-dev