tree a7b8d9b59a6a8a8c840b4807a843158466c6a524
parent 349c866e399a1eb2e85b1982d5d10f3a8cc4c69b
parent 1f458fb6a1fbb8ec693d10f195b99310bcfd34d0
author Jorim Jaggi <jjaggi@google.com> 1458953966 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458953967 +0000

Merge "More transition fixes" into nyc-dev