tree cd81951bc0a6da1f1af6a182eb26560ff332aad9
parent 4bd2c00d8d27d37c5e90a42ec2e39dd9fdd149eb
parent 23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d
author George Mount <mount@google.com> 1423096321 +0000
committer android-build-merger <android-build-merger@google.com> 1423096321 +0000

Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c
automerge: 23eef1e

* commit '23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.