tree beb56afea39fd8955a839e68a83fb941b5e5dd59
parent 82a840267842eb80f3002e5e0503fa001c159630
parent ae2c3fc49fcbed266b680f7a1df3c5dee586f429
author George Mount <mount@google.com> 1410202167 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410202167 +0000

am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev

* commit '055417d3255810a5d940fe5a94b8713906370344':
  Use Alpha instead of TransitionAlpha for Activity Transitions.