tree b2bb205ec6a83d76edcf506af4f7714a2a038bd0
parent eba260d6d361dcfb749ce390320257c28c474ae1
author Jeff Sharkey <jsharkey@android.com> 1429643643 -0700
committer Jeff Sharkey <jsharkey@android.com> 1429643911 -0700

Blend in force adoptable flag when set.

Bug: 19993667
Change-Id: Ic7f348d171a89e889281b7efb1aa0cbade048975