Merge "Actually make OWNERS in sync with the internal version"

am: 7e54042f9c

Change-Id: Id6f2551434279d9d5be0c0cb2c72d59393bd4095
This commit is contained in:
Makoto Onuki
2018-08-24 15:08:00 -07:00
committed by android-build-merger