am 7c54ef9a: am 14f73a02: Merge "Restore opaque alpha value when AlphaAnimation finishes" into jb-dev

* commit '7c54ef9a0e27b5146a51ebeb267a0a6a1fd9174f':
  Restore opaque alpha value when AlphaAnimation finishes