tree 10a0737b6f9404eb4dcd3c47e0f69fdb3c594631
parent 287fa9bb2864fd0eb238bb9e22efbf8914a106e7
parent bc75159db62cb6b7937d6321ff2ff754c8948881
author Felipe Leme <felipeal@google.com> 1537828540 -0700
committer android-build-merger <android-build-merger@google.com> 1537828540 -0700

Merge "Fixed when the CompatibilityBridge is attached to an activity." into pi-dev am: 45fda27211
am: bc75159db6

Change-Id: Ibefc537b796cef5522f854c8abd3e942e545f2f8