tree 51a98e2974567271dc6fa58defc6f3899db4adf7
parent c69a11fb7ae2b2fa12f9125aaf1567c4786612ac
parent 1259f616c26f89dd5000745d7c364fae41b23682
author Alan Viverette <alanv@google.com> 1446836971 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446836971 +0000

Merge "Use ConstantState directly instead of ConstantStateFuture"