Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e

am: a1980abe1f  -s ours

Change-Id: I613b3f6e028acf05213db3e3765b9faf973c9976
This commit is contained in:
Tao Bao 2017-06-02 22:59:44 +00:00 committed by android-build-merger
commit 132566628b

Diff Content Not Available