automerge: c3a043c
* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
automerge: c3a043c
* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.