tree 55f2546f2036c4512174c04ec0bb33273ef489c9
parent 761ddc1c6a1857fac67fbb690c99d6fe67d4ebaa
parent 83c37379dafdf687da290cf412129ea21573dea9
author Makoto Onuki <omakoto@google.com> 1535149042 -0700
committer android-build-merger <android-build-merger@google.com> 1535149042 -0700

Merge "Actually make OWNERS in sync with the internal version" am: 7e54042f9c
am: 83c37379da

Change-Id: I1bbd7ccc7b610d9cbdcf9f7f8f52b734679766cd