[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours am: 1e56e69a46 -s ours am: 1237373743 -s ours
am: 64e4c89ef6 -s ours
Change-Id: I8b4a41fa2ef2fb023ba4f5ac96494be8172cb6ec
This commit is contained in: