tree edbc27b0e8997c5e70dea8a4f4fdbdce51838d5d
parent 898385ed596fcc0a6a7c9ac3995fa57a6badecec
parent 6d7dc11e01d8a127000e69c809ef963158e8c642
author Michael Kwan <mkwan@google.com> 1484003185 +0000
committer android-build-merger <android-build-merger@google.com> 1484003185 +0000

Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
am: 6d7dc11e01

Change-Id: I1ad11517c50cda3b37d3193ace983bb8b1a58c36